[jboss-svn-commits] JBL Code SVN: r33091 - in labs/jbossesb/trunk/product: docs and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 26 10:14:49 EDT 2010
Author: tfennelly
Date: 2010-05-26 10:14:46 -0400 (Wed, 26 May 2010)
New Revision: 33091
Modified:
labs/jbossesb/trunk/product/.classpath
labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java
labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Customer.wsdl
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_2451_SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Retailer.wsdl
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
Log:
https://jira.jboss.org/browse/JBESB-3259
Add support for multiple wsdl services to SoapUIClientService
Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/.classpath 2010-05-26 14:14:46 UTC (rev 33091)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/src"/>
+ <classpathentry kind="src" path="services/soapui-client/src/main/resources"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/src"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/resources"/>
<classpathentry excluding="**/.svn/" kind="src" path="services/jbossesb/src/main/java"/>
@@ -28,7 +29,6 @@
<classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.0.1.jar"/>
<classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.1.0.jar"/>
<classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.2.0.jar"/>
- <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-registry.jar"/>
<classpathentry kind="lib" path="build/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/ant-1.7.0.jar"/>
<classpathentry kind="lib" path="build/lib/antlr-2.7.7.jar"/>
@@ -169,5 +169,7 @@
<classpathentry kind="lib" path="build/lib/milyn-smooks-templating-1.2.5.jar"/>
<classpathentry kind="lib" path="build/lib/milyn-smooks-validation-1.2.5.jar"/>
<classpathentry kind="lib" path="build/lib/milyn-tinak-1.2.5.jar"/>
+ <classpathentry kind="lib" path="services/soapui-client/src/lib/looks-2.1.2.jar"/>
+ <classpathentry kind="lib" path="services/soapui-client/src/lib/soap-xmlbeans-1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer1/jboss-esb.xml 2010-05-26 14:14:46 UTC (rev 33091)
@@ -42,7 +42,8 @@
<property name="wsdl" value="http://127.0.0.1:8080/Quickstart_webservice_consumer1/HelloWorldWS?wsdl" />
<!--property name="wsdlTransform" value="/consumer1-wsdl-transform.xml" / -->
<property name="responseAsOgnlMap" value="true" />
- <property name="SOAPAction" value="sayHello"/>
+ <property name="SOAPAction" value="sayHello"/>
+ <property name="SOAPService" value="{http://webservice_consumer1/helloworld}HelloWorldWSService" /> <!-- Optional - if not spec'd, selects first service with name. -->
</action>
<action name="response-mapper"
class="org.jboss.soa.esb.samples.quickstart.webservice_consumer1.MyResponseAction">
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -34,8 +34,8 @@
*/
public class MBeanSoapUIInvoker implements SoapUIInvoker {
- private static final String[] buildRequestSig = new String[] {String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
- private static final String[] buildFaultSig = new String[] {String.class.getName(), String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
+ private static final String[] buildRequestSig = new String[] {String.class.getName(), String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
+ private static final String[] buildFaultSig = new String[] {String.class.getName(), String.class.getName(), String.class.getName(), String.class.getName(), Map.class.getName(), Properties.class.getName(), String.class.getName(), String.class.getName()};
private static final String[] getEndpointSig = new String[] {String.class.getName(), Properties.class.getName()};
private MBeanServer mbeanServer;
private ObjectName serviceName;
@@ -68,9 +68,9 @@
* @throws UnsupportedOperationException Operation not supported on specified WSDL.
* @throws org.xml.sax.SAXException Failed to parse the SOAP UI generated request message.
*/
- public String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ public String buildRequest(String wsdl, String operation, String wServiceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
try {
- return (String) mbeanServer.invoke(serviceName, "buildRequest", new Object[] {wsdl, operation, params, httpClientProps, smooksResource, soapNs}, buildRequestSig);
+ return (String) mbeanServer.invoke(serviceName, "buildRequest", new Object[] {wsdl, operation, wServiceName, params, httpClientProps, smooksResource, soapNs}, buildRequestSig);
} catch (InstanceNotFoundException e) {
throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'. This service must be deployed before this action can be used.", e);
} catch (MBeanException e) {
@@ -100,9 +100,9 @@
* @throws UnsupportedOperationException Operation not supported on specified WSDL.
* @throws org.xml.sax.SAXException Failed to parse the SOAP UI generated request message.
*/
- public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ public String buildResponse(String wsdl, String operation, String wServiceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
try {
- return (String) mbeanServer.invoke(serviceName, "buildResponse", new Object[] {wsdl, operation, params, httpClientProps, smooksResource, soapNs}, buildRequestSig);
+ return (String) mbeanServer.invoke(serviceName, "buildResponse", new Object[] {wsdl, operation, wServiceName, params, httpClientProps, smooksResource, soapNs}, buildRequestSig);
} catch (InstanceNotFoundException e) {
throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'. This service must be deployed before this action can be used.", e);
} catch (MBeanException e) {
@@ -116,9 +116,9 @@
- public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ public String buildFault(String wsdl, String operation, String wServiceName, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
try {
- return (String) mbeanServer.invoke(serviceName, "buildFault", new Object[] {wsdl, operation, faultName, params, httpClientProps, smooksResource, soapNs}, buildFaultSig);
+ return (String) mbeanServer.invoke(serviceName, "buildFault", new Object[] {wsdl, operation, wServiceName, faultName, params, httpClientProps, smooksResource, soapNs}, buildFaultSig);
} catch (InstanceNotFoundException e) {
throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'. This service must be deployed before this action can be used.", e);
} catch (MBeanException e) {
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -280,6 +280,7 @@
private String wsdl;
private String soapAction;
+ private String soapServiceName;
private String soapNs;
private String paramsLocation;
private String responseLocation;
@@ -302,6 +303,8 @@
public SOAPClient(ConfigTree config) throws ConfigurationException {
wsdl = config.getRequiredAttribute("wsdl");
soapAction = config.getRequiredAttribute("SOAPAction");
+ soapServiceName = config.getAttribute("SOAPService");
+
createPayloadProxy(config);
responseAsOgnlMap = "true".equalsIgnoreCase(config.getAttribute("responseAsOgnlMap"));
smooksTransform = config.getAttribute("smooksTransform");
@@ -425,7 +428,7 @@
String request;
try {
- request = soapUIInvoker.buildRequest(wsdl, getEndpointOperation(), params, httpClientProps, smooksTransform, soapNs);
+ request = soapUIInvoker.buildRequest(wsdl, getEndpointOperation(), soapServiceName, params, httpClientProps, smooksTransform, soapNs);
} catch (IOException e) {
throw new ActionProcessingException("soapUI Client Service invocation failed.", e);
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SoapUIInvoker.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -10,11 +10,11 @@
* @author
*/
public interface SoapUIInvoker {
- String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ String buildRequest(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
- String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ String buildResponse(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
- String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ String buildFault(String wsdl, String operation, String serviceName, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
String getEndpoint(String wsdl, Properties httpClientProps) throws IOException;
Modified: labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -47,16 +47,16 @@
SoapUIInvoker soapUIInvoker = new SoapUIInvoker() {
private SoapUIClientService service = new SoapUIClientService();
- public String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
- return service.buildRequest(wsdl, operation, params, httpClientProps, smooksResource, soapNs);
+ public String buildRequest(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ return service.buildRequest(wsdl, operation, null, params, httpClientProps, smooksResource, soapNs);
}
- public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
- return service.buildResponse(wsdl, operation, params, httpClientProps, smooksResource, soapNs) ;
+ public String buildResponse(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ return service.buildResponse(wsdl, operation, null, params, httpClientProps, smooksResource, soapNs) ;
}
- public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
- return service.buildFault(wsdl, operation, faultName, params, httpClientProps, smooksResource, soapNs) ;
+ public String buildFault(String wsdl, String operation, String serviceName, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ return service.buildFault(wsdl, operation, null, faultName, params, httpClientProps, smooksResource, soapNs) ;
}
public String getEndpoint(String wsdl, Properties httpClientProps) throws IOException {
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -37,7 +37,13 @@
import java.util.Properties;
import java.util.Set;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Import;
import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -311,6 +317,7 @@
*
* @param wsdl WSDL URL.
* @param operation Operation name.
+ * @param serviceName Service Name.
* @param params Message parameter map.
* @param httpClientProps {@link org.apache.commons.httpclient.HttpClient} creation properties.
* @param smooksResource {@link org.milyn.Smooks} transformation configuration resource. This is the actual
@@ -321,8 +328,8 @@
* @return The SOAP Message.
* @throws IOException Failed to load WSDL.
*/
- public String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
- Operation operationInst = getOperation(wsdl, operation, httpClientProps);
+ public String buildRequest(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ Operation operationInst = getOperation(wsdl, operation, serviceName, httpClientProps, true);
String requestTemplate = operationInst.getRequestAt(0).getRequestContent();
return buildSOAPMessage(requestTemplate, params, smooksResource, soapNs);
@@ -333,6 +340,7 @@
*
* @param wsdl WSDL URL
* @param operation Operation name.
+ * @param serviceName Service Name.
* @param params Message parameter map.
* @param httpClientProps {@link org.apache.commons.httpclient.HttpClient} creation properties.
* @param smooksResource {@link org.milyn.Smooks} transformation configuration resource file.
@@ -344,17 +352,17 @@
* @throws UnsupportedOperationException Operation not supported on specified WSDL.
* @throws SAXException Failed to parse the SOAP UI generated request message.
*/
- public String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
- Operation operationInst = getOperation(wsdl, operation, httpClientProps);
+ public String buildResponse(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ Operation operationInst = getOperation(wsdl, operation, serviceName, httpClientProps, true);
WsdlOperation wsdlOperation = (WsdlOperation)operationInst;
String responseTemplate = wsdlOperation.createResponse(true);
return buildSOAPMessage(responseTemplate, params, smooksResource, soapNs);
}
- public String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
+ public String buildFault(String wsdl, String operation, String serviceName, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException {
String faultDetail = null;
- Operation operationInst = getOperation(wsdl, operation, httpClientProps);
+ Operation operationInst = getOperation(wsdl, operation, serviceName, httpClientProps, true);
WsdlOperation wsdlOperation = (WsdlOperation)operationInst;
MessagePart[] faultParts = wsdlOperation.getFaultParts();
params.put("Fault.faultcode","soapenv:server");
@@ -437,31 +445,87 @@
}
}
- private Operation getOperation(String wsdl, String operation, Properties httpClientProps) throws IOException, UnsupportedOperationException {
+ protected Operation getOperation(String wsdl, String operationName, String serviceName, Properties httpClientProps, boolean refresh) throws IOException {
WsdlInterface[] wsdlInterfaces = getWsdlInterfaces(wsdl, httpClientProps);
for (WsdlInterface wsdlInterface : wsdlInterfaces) {
- Operation operationInst = wsdlInterface.getOperationByName(operation);
-
- if (operationInst != null) {
- return operationInst;
+ List<Operation> operations = wsdlInterface.getOperations();
+
+ for(Operation operation: operations) {
+ if(operation.getName().equals(operationName)) {
+ if(serviceName != null) {
+ Definition definition;
+ try {
+ definition = wsdlInterface.getWsdlContext().getDefinition();
+ } catch (Exception e) {
+ throw new IOException("Failed to get WsdlContext from WsdlInterface.", e);
+ }
+ QName serviceQName = getServiceName(wsdlInterface.getBindingName(), definition);
+ if(serviceName != null && !serviceName.equals(serviceQName.toString())) {
+ // Not the correct service... continue looking for the operation...
+ continue;
+ }
+ }
+
+ return operation;
+ }
}
}
- // Try clearing WSDL cache, WSDL may have updated
- wsdls.remove(wsdl);
- wsdlInterfaces = getWsdlInterfaces(wsdl, httpClientProps);
-
- for (WsdlInterface wsdlInterface : wsdlInterfaces) {
- Operation operationInst = wsdlInterface.getOperationByName(operation);
-
- if (operationInst != null) {
- return operationInst;
- }
+ if(refresh) {
+ // Try clearing WSDL cache, WSDL may have updated
+ wsdls.remove(wsdl);
+ wsdlInterfaces = getWsdlInterfaces(wsdl, httpClientProps);
+
+ return getOperation(wsdl, operationName, serviceName, httpClientProps, false);
}
- throw new UnsupportedOperationException("Operation '" + operation + "' not supported by WSDL '" + wsdl + "'.");
+ throw new UnsupportedOperationException("Operation '" + operationName + "' not supported by WSDL '" + wsdl + "'.");
}
+
+ private QName getServiceName(QName bindingQName, Definition definition) {
+
+ try {
+ Map<Object, Service> services = definition.getServices();
+
+ // Is it one of the services on this wsdl...
+ if(services != null && !services.isEmpty()) {
+ for(Service service : services.values()) {
+ Map<Object, Port> ports = service.getPorts();
+ if(ports != null) {
+ for(Port port : ports.values()) {
+ Binding binding = port.getBinding();
+ if(binding.getQName().equals(bindingQName)) {
+ return service.getQName();
+ }
+ }
+ }
+ }
+ }
+
+ // Is it one of the services in one of the imported wsdls (if any)...
+ Map imports = definition.getImports();
+ if(imports != null && !imports.isEmpty()) {
+ for(Object importListObj : imports.values()) {
+ if(importListObj instanceof List) {
+ List<Import> importList = (List<Import>) importListObj;
+ if(importList != null) {
+ for(Import importInst : importList) {
+ QName serviceQName = getServiceName(bindingQName, importInst.getDefinition());
+ if(serviceQName != null) {
+ return serviceQName;
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error resolving service name associated with binding '" + bindingQName + "'.", e);
+ }
+
+ return null;
+ }
private String buildSOAPMessage(String soapMessageTemplate, Map params, String smooksResource, String soapNs) throws IOException, SAXException {
Document messageDoc = getDocument(soapMessageTemplate) ;
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -41,6 +41,7 @@
*
* @param wsdl WSDL URL.
* @param operation Operation name.
+ * @param serviceName Service Name.
* @param params Message parameter map.
* @param httpClientProps {@link org.apache.commons.httpclient.HttpClient} creation properties.
* @param smooksResource {@link org.milyn.Smooks} transformation configuration resource file.
@@ -52,13 +53,14 @@
* @throws UnsupportedOperationException Operation not supported on specified WSDL.
* @throws SAXException Failed to parse the SOAP UI generated request message.
*/
- public abstract String buildRequest(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ public abstract String buildRequest(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
/**
* Use soapUI mockService to Build a SOAP response for the specified operation on the specified WSDL.
*
* @param wsdl WSDL URL.
* @param operation Operation name.
+ * @param serviceName Service Name.
* @param params Message parameter map..
* @param smooksResource {@link org.milyn.Smooks} transformation configuration resource file.
* Null if no transformations are to be performed on the SOAP message before serializing it
@@ -69,10 +71,10 @@
* @throws UnsupportedOperationException Operation not supported on specified WSDL.
* @throws SAXException Failed to parse the SOAP UI generated request message.
*/
- public abstract String buildResponse(String wsdl, String operation, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ public abstract String buildResponse(String wsdl, String operation, String serviceName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
- public abstract String buildFault(String wsdl, String operation, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
+ public abstract String buildFault(String wsdl, String operation, String serviceName, String faultName, Map params, Properties httpClientProps, String smooksResource, String soapNs) throws IOException, UnsupportedOperationException, SAXException;
/**
* Get the 1st endpoint from the specified WSDL.
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Customer.wsdl
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Customer.wsdl 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Customer.wsdl 2010-05-26 14:14:46 UTC (rev 33091)
@@ -27,7 +27,10 @@
<wsdl:input message="tns:SendOrderConfirmationRequest" />
<wsdl:output message="tns:SendOrderConfirmationResponse" />
</wsdl:operation>
-
+ <wsdl:operation name="BlastOrder">
+ <wsdl:input message="tns:SendOrderConfirmationRequest" />
+ <wsdl:output message="tns:SendOrderConfirmationResponse" />
+ </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="CustomerSoap" type="tns:CustomerPortType">
@@ -43,6 +46,17 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="BlastOrder">
+ <soap:operation
+ soapAction="http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl/BlastOrder"
+ style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="CustomerService">
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -115,12 +115,12 @@
params.put("postBlahMessage", postBlahMessage1);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
params.put("postBlahMessage", postBlahMessage2);
- message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
}
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_2451_SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_2451_SoapUIClientServiceMBeanUnitTest.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_2451_SoapUIClientServiceMBeanUnitTest.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -142,7 +142,7 @@
params.put("dumpSOAP", true);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
}
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Retailer.wsdl
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Retailer.wsdl 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/Retailer.wsdl 2010-05-26 14:14:46 UTC (rev 33091)
@@ -29,6 +29,10 @@
<wsdl:input message="tns:SubmitOrderRequest" />
<wsdl:output message="tns:SubmitOrderResponse" />
</wsdl:operation>
+ <wsdl:operation name="BlastOrder">
+ <wsdl:input message="tns:SubmitOrderRequest" />
+ <wsdl:output message="tns:SubmitOrderResponse" />
+ </wsdl:operation>
</wsdl:portType>
<wsdl:binding name="RetailerBinding" type="tns:RetailerPortType">
<soap:binding style="document"
@@ -43,6 +47,16 @@
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="BlastOrder">
+ <soap:operation
+ soapAction="http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl/BlastOrder" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="RetailerService">
<wsdl:port name="RetailerPort" binding="tns:RetailerBinding">
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2010-05-26 12:41:20 UTC (rev 33090)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2010-05-26 14:14:46 UTC (rev 33091)
@@ -43,6 +43,8 @@
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
+import com.eviware.soapui.model.iface.Operation;
+
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
@@ -62,7 +64,7 @@
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
params.put("salesOrderNotification", new OrderNotification());
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SendSalesOrderNotification", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SendSalesOrderNotification", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See expected_01.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_01.xml"), new ByteArrayInputStream(message.getBytes())));
assertEquals("http://localhost:18080/active-bpel/services/RetailerCallback", mbean.getEndpoint(wsdlFile.toURI().toString(), properties));
}
@@ -87,21 +89,21 @@
order2.items = items2;
params.put("customerOrder", order1);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", params, properties, null, soapNs);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", null, params, properties, null, soapNs);
assertTrue("Generated SOAP message not as expected. See expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
items1.remove(0);items1.remove(0);items1.remove(0);
- message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", params, properties, null, soapNs);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", null, params, properties, null, soapNs);
assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
params.put("customerOrder", order2);
- message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", params, properties, null, soapNs);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", null, params, properties, null, soapNs);
assertTrue("Generated SOAP message not as expected. See expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
items2 = new OrderItem[] {new OrderItem(4, "item4", 4, new BigDecimal(4.00), 4)};
order2.items = items2;
params.put("customerOrder", order2);
- message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", params, properties, null, soapNs);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", null, params, properties, null, soapNs);
assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
params.clear();
@@ -110,10 +112,69 @@
params.put("customerOrder.items[0].quantity", 4);
params.put("customerOrder.items[0].price", 4);
params.put("customerOrder.items[0].extensionAmount", 4);
- message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", params, properties, null, soapNs);
assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
}
+ public void test_has_collections_01_with_serviceName() throws IOException, SAXException, ConfigurationException {
+ File wsdlFile = new File(WSDL_LOCATAION + "/BPELRetailer.wsdl");
+ String soapNs = null;
+ SoapUIClientService mbean = new SoapUIClientService();
+ Map params = new HashMap();
+ CustomerOrder1 order1 = new CustomerOrder1();
+ CustomerOrder2 order2 = new CustomerOrder2();
+ List<OrderItem> items1 = new ArrayList<OrderItem>();
+ OrderItem[] items2 = new OrderItem[4];
+
+ params.put("dumpSOAP", null);
+
+ properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
+
+ addOrderItems(items1);
+ order1.items = items1;
+ items1.toArray(items2);
+ order2.items = items2;
+
+ params.put("customerOrder", order1);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", params, properties, null, soapNs);
+ assertTrue("Generated SOAP message not as expected. See expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
+
+ items1.remove(0);items1.remove(0);items1.remove(0);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", params, properties, null, soapNs);
+ assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
+
+ params.put("customerOrder", order2);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", params, properties, null, soapNs);
+ assertTrue("Generated SOAP message not as expected. See expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
+
+ items2 = new OrderItem[] {new OrderItem(4, "item4", 4, new BigDecimal(4.00), 4)};
+ order2.items = items2;
+ params.put("customerOrder", order2);
+ message = mbean.buildRequest(wsdlFile.toURI().toString(), "SubmitOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", params, properties, null, soapNs);
+ assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
+
+ params.clear();
+ params.put("customerOrder.items[0].partNumber", 4);
+ params.put("customerOrder.items[0].description", "item4");
+ params.put("customerOrder.items[0].quantity", 4);
+ params.put("customerOrder.items[0].price", 4);
+ params.put("customerOrder.items[0].extensionAmount", 4);
+ assertTrue("Generated SOAP message not as expected. See expected_03.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_03.xml"), new ByteArrayInputStream(message.getBytes())));
+ }
+
+ public void test_getOperation_with_serviceName() throws IOException, SAXException, ConfigurationException {
+ File wsdlFile = new File(WSDL_LOCATAION + "/BPELRetailer.wsdl");
+ SoapUIClientService mbean = new SoapUIClientService();
+
+ properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
+
+ Operation retailerBlast1 = mbean.getOperation(wsdlFile.toURI().toString(), "BlastOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", properties, true);
+ Operation retailerBlast2 = mbean.getOperation(wsdlFile.toURI().toString(), "BlastOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/retailer/2006/04/Retailer.wsdl}RetailerService", properties, true);
+ Operation retailerBlast3 = mbean.getOperation(wsdlFile.toURI().toString(), "BlastOrder", "{http://docs.active-endpoints.com/activebpel/sample/wsdl/customer/2006/04/Customer.wsdl}CustomerService", properties, true);
+
+ assertTrue(retailerBlast1 == retailerBlast2);
+ assertFalse(retailerBlast2 == retailerBlast3);
+ }
+
public void test_has_collections_02() throws IOException, SAXException, ConfigurationException {
File wsdlFile = new File(WSDL_LOCATAION + "/orderprocessing/OrderProcessing.wsdl");
SoapUIClientService mbean = new SoapUIClientService();
@@ -151,7 +212,7 @@
lineItem.setPrice(76.34f);
params.put("processOrder", request);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_01.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_01.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -190,7 +251,7 @@
lineItem.setPrice(76.34f);
params.put("processOrder", request);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_01_JBESB-1329.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_01_JBESB-1329.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -211,7 +272,7 @@
// No line Items....
params.put("processOrder", request);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -232,7 +293,7 @@
// No line Items....
params.put("processOrder", request);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_02_JBESB-1329.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_02_JBESB-1329.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -256,7 +317,7 @@
params.put("processOrder.order.lineItems[2].name", "item3");
params.put("processOrder.order.lineItems[2].price", 76.34f);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_01.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_01.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -280,7 +341,7 @@
params.put("processOrder.order.lineItems[2].name", "item3");
params.put("processOrder.order.lineItems[2].price", 76.34f);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_01_JBESB-1329.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_01_JBESB-1329.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -296,7 +357,7 @@
// No line Items....
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "processOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See orderprocessing/expected_02.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("orderprocessing/expected_02.xml"), new ByteArrayInputStream(message.getBytes())));
}
@@ -307,7 +368,7 @@
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
params.put("salesOrderNotification", new OrderNotification());
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SendSalesOrderNotification", params, properties, StreamUtils.readStreamString(getClass().getResourceAsStream("sendNotificationTransform.xml"), "UTF-8"), null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "SendSalesOrderNotification", null, params, properties, StreamUtils.readStreamString(getClass().getResourceAsStream("sendNotificationTransform.xml"), "UTF-8"), null);
assertTrue("Generated SOAP message not as expected. See expected_04.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_04.xml"), new ByteArrayInputStream(message.getBytes())));
assertEquals("http://localhost:18080/active-bpel/services/RetailerCallback", mbean.getEndpoint(wsdlFile.toURI().toString(), properties));
}
@@ -318,7 +379,7 @@
SoapUIClientService mbean = new SoapUIClientService();
Map<Object, Object> paras = new HashMap<Object, Object>();
paras.put("sayHiReponse.arg0", "response");
- String str = mbean.buildResponse(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", paras, properties, null, null);
+ String str = mbean.buildResponse(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", null, paras, properties, null, null);
assertTrue("Failed to generate correct soap response", str.indexOf("<say:arg0>response</say:arg0>") > -1);
}
@@ -328,7 +389,7 @@
SoapUIClientService mbean = new SoapUIClientService();
Map<Object, Object> paras = new HashMap<Object, Object>();
paras.put("Fault.detail.sayFault.code", "test");
- String str = mbean.buildFault(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", "HelloWorldPubServiceFault1", paras, properties, null, null);
+ String str = mbean.buildFault(wsdlFile.toURL().toString(), "HelloWorldPubServiceOp", null, "HelloWorldPubServiceFault1", paras, properties, null, null);
assertTrue("Failed to generate correct soap fault message", str.indexOf("<say:code>test</say:code>") > -1);
}
@@ -345,7 +406,7 @@
params.put("cancelOrder", cancelorder);
- String message = mbean.buildRequest(wsdlFile.toURI().toString(), "CancelOrder", params, properties, null, null);
+ String message = mbean.buildRequest(wsdlFile.toURI().toString(), "CancelOrder", null, params, properties, null, null);
assertTrue("Generated SOAP message not as expected. See expected_05.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_05.xml"), new ByteArrayInputStream(message.getBytes())));
assertEquals("http://localhost:18080/active-bpel/services/RetailerCallback", mbean.getEndpoint(wsdlFile.toURI().toString(), properties));
}
More information about the jboss-svn-commits
mailing list