[jbossws-commits] JBossWS SVN: r11385 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/scripts and 6 other directories.

Author: richard.opalka(a)jboss.com Date: 2010-01-12 02:15:47 -0500 (Tue, 12 Jan 2010) New Revision: 11385 Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl Removed: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBPAPP-2913] MetadataBuilder chokes on multiple imports: 'Cannot find port with name ...' Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-11 10:17:52 UTC (rev 11384) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-01-12 07:15:47 UTC (rev 11385) @@ -376,10 +376,13 @@ String tnsURI = wsdlOneOneDefinition.getTargetNamespace(); // search for matching portElement and replace the address URI - Port wsdlOneOnePort = modifyPortAddress(tnsURI, portQName, serviceEndpointURL, wsdlOneOneDefinition.getServices()); + if (modifyPortAddress(tnsURI, portQName, serviceEndpointURL, wsdlOneOneDefinition.getServices())) + { + return; + } - // recursivly process imports if none can be found - if (wsdlOneOnePort == null && !wsdlOneOneDefinition.getImports().isEmpty()) + // recursively process imports if none can be found + if (!wsdlOneOneDefinition.getImports().isEmpty()) { Iterator imports = wsdlOneOneDefinition.getImports().values().iterator(); @@ -390,19 +393,28 @@ while (importsByNS.hasNext()) { Import anImport = (Import)importsByNS.next(); - wsdlOneOnePort = modifyPortAddress(anImport.getNamespaceURI(), portQName, serviceEndpointURL, anImport.getDefinition().getServices()); + if (modifyPortAddress(anImport.getNamespaceURI(), portQName, serviceEndpointURL, anImport.getDefinition().getServices())) + { + return; + } } } } - - // if it still doesn't exist something is wrong - if (wsdlOneOnePort == null) - throw new IllegalArgumentException("Cannot find port with name '" + portQName + "' in wsdl document"); + + throw new IllegalArgumentException("Cannot find port with name '" + portQName + "' in wsdl document"); } - private static Port modifyPortAddress(String tnsURI, QName portQName, String serviceEndpointURL, Map services) + /** + * Try matching the port and modify it. Return true if the port is actually matched. + * + * @param tnsURI + * @param portQName + * @param serviceEndpointURL + * @param services + * @return + */ + private static boolean modifyPortAddress(String tnsURI, QName portQName, String serviceEndpointURL, Map services) { - Port wsdlOneOnePort = null; Iterator itServices = services.values().iterator(); while (itServices.hasNext()) { @@ -414,7 +426,7 @@ String portLocalName = (String)itPorts.next(); if (portQName.equals(new QName(tnsURI, portLocalName))) { - wsdlOneOnePort = (Port)wsdlOneOnePorts.get(portLocalName); + Port wsdlOneOnePort = (Port)wsdlOneOnePorts.get(portLocalName); List extElements = wsdlOneOnePort.getExtensibilityElements(); for (Object extElement : extElements) { @@ -434,11 +446,11 @@ address.setLocationURI(serviceEndpointURL); } } + return true; } } } - - return wsdlOneOnePort; + return false; } private static String getUriScheme(String addrStr) Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-01-11 10:17:52 UTC (rev 11384) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-01-12 07:15:47 UTC (rev 11385) @@ -568,7 +568,18 @@ <include name="wsdl/SwaTestService.wsdl"/> <include name="jboss-web.xml"/> </webinf> - </war> + </war> + + <!-- jaxws-jbws2784 --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2784.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2784/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2784/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2784/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784 (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws2784; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2784] MetaDataBuilder chokes on multiple imports - * - * @author alessio.soldano(a)jboss.com - */ -public class JBWS2784TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS2784TestCase.class, "jaxws-jbws2784.jar"); - } - - public void test() throws Exception - { - //nothing to do for this test once the deploy succeeded - } -} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/JBWS2784TestCase.java 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2784; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2784] MetaDataBuilder chokes on multiple imports + * + * @author alessio.soldano(a)jboss.com + */ +public class JBWS2784TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS2784TestCase.class, "jaxws-jbws2784.jar"); + } + + public void test() throws Exception + { + //nothing to do for this test once the deploy succeeded + } +} Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws2784; - -import javax.ejb.Stateless; -import javax.xml.transform.Source; -import javax.xml.ws.Provider; -import javax.xml.ws.Service; -import javax.xml.ws.ServiceMode; -import javax.xml.ws.WebServiceProvider; - -/** - * - * @author alessio.soldano(a)jboss.com - */ -@WebServiceProvider(serviceName = "RetailerService", - portName = "RetailerPort", - targetNamespace = "http://www.jboss.org/samples/bpel/Retailer.wsdl", - wsdlLocation = "META-INF/wsdl/BPELRetailer.wsdl") -@ServiceMode(value = Service.Mode.PAYLOAD) -@Stateless -public class ProviderBean implements Provider<Source> -{ - public Source invoke(Source request) - { - return request; - } -} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2784/ProviderBean.java 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws2784; + +import javax.ejb.Stateless; +import javax.xml.transform.Source; +import javax.xml.ws.Provider; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceProvider; + +/** + * + * @author alessio.soldano(a)jboss.com + */ +@WebServiceProvider(serviceName = "RetailerService", + portName = "RetailerPort", + targetNamespace = "http://www.jboss.org/samples/bpel/Retailer.wsdl", + wsdlLocation = "META-INF/wsdl/BPELRetailer.wsdl") +@ServiceMode(value = Service.Mode.PAYLOAD) +@Stateless +public class ProviderBean implements Provider<Source> +{ + public Source invoke(Source request) + { + return request; + } +} Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784 (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF) Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="BPELRetailer" targetNamespace="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl... xmlns:tns="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl" xmlns:ord="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" xmlns:cust="http://www.jboss.org/samples/bpel/Customer.xsd" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:rws="http://www.jboss.org/samples/bpel/Retailer.wsdl" xmlns:cws="http://www.jboss.org/samples/bpel/Customer.wsdl"> - <wsdl:import namespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" location="Retailer.wsdl"/> - <wsdl:import namespace="http://www.jboss.org/samples/bpel/Customer.wsdl" location="Customer.wsdl"/> - <wsdl:import namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" location="OrderManager.wsdl"/> - <plnk:partnerLinkType xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" name="PurchasingPLT"> - <plnk:role name="Buyer" portType="cws:CustomerPortType"/> - <plnk:role name="Seller" portType="rws:RetailerPortType"/> - </plnk:partnerLinkType> - <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="customerNumber" type="xsd:string"/> - <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="poNumber" type="xsd:string"/> - <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="cws:SendOrderConfirmationRequest" part="Document" propertyName="tns:poNumber"> - <vprop:query>/cust:orderConfirmation/cust:poNumber</vprop:query> - </vprop:propertyAlias> - <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:poNumber"> - <vprop:query> - /ord:customerOrder/ord:header/ord:poNumber - </vprop:query> - </vprop:propertyAlias> - <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="orderNum" type="xsd:string"/> - <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:OrderManagerPortType_customerOrderResponse" part="result" propertyName="tns:orderNum"/> - <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:SendSalesOrderNotificationRequest" part="Document" propertyName="tns:orderNum"> - <vprop:query>ns:orderNumber</vprop:query> - </vprop:propertyAlias> - <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:customerNumber"> - <vprop:query>ord:header/ord:customerNumber</vprop:query> - </vprop:propertyAlias> -</wsdl:definitions> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/BPELRetailer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="BPELRetailer" targetNamespace="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl... xmlns:tns="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl" xmlns:ord="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" xmlns:cust="http://www.jboss.org/samples/bpel/Customer.xsd" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:rws="http://www.jboss.org/samples/bpel/Retailer.wsdl" xmlns:cws="http://www.jboss.org/samples/bpel/Customer.wsdl"> + <wsdl:import namespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" location="Retailer.wsdl"/> + <wsdl:import namespace="http://www.jboss.org/samples/bpel/Customer.wsdl" location="Customer.wsdl"/> + <wsdl:import namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" location="OrderManager.wsdl"/> + <plnk:partnerLinkType xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" name="PurchasingPLT"> + <plnk:role name="Buyer" portType="cws:CustomerPortType"/> + <plnk:role name="Seller" portType="rws:RetailerPortType"/> + </plnk:partnerLinkType> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="customerNumber" type="xsd:string"/> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="poNumber" type="xsd:string"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="cws:SendOrderConfirmationRequest" part="Document" propertyName="tns:poNumber"> + <vprop:query>/cust:orderConfirmation/cust:poNumber</vprop:query> + </vprop:propertyAlias> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:poNumber"> + <vprop:query> + /ord:customerOrder/ord:header/ord:poNumber + </vprop:query> + </vprop:propertyAlias> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="orderNum" type="xsd:string"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:OrderManagerPortType_customerOrderResponse" part="result" propertyName="tns:orderNum"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:SendSalesOrderNotificationRequest" part="Document" propertyName="tns:orderNum"> + <vprop:query>ns:orderNumber</vprop:query> + </vprop:propertyAlias> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:customerNumber"> + <vprop:query>ord:header/ord:customerNumber</vprop:query> + </vprop:propertyAlias> +</wsdl:definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="Customer" - targetNamespace="http://www.jboss.org/samples/bpel/Customer.wsdl" - xmlns:tns="http://www.jboss.org/samples/bpel/Customer.wsdl" - xmlns:cust="http://www.jboss.org/samples/bpel/Customer.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - - <wsdl:types> - <!--<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import - namespace="http://www.jboss.org/samples/bpel/Customer.xsd" - schemaLocation="../schema/Customer.xsd" /> - </xs:schema>--> - </wsdl:types> - - <wsdl:message name="SendOrderConfirmationRequest"> - <wsdl:part name="Document" element="cust:orderConfirmation" /> - </wsdl:message> - - <wsdl:message name="SendOrderConfirmationResponse"> - <wsdl:part name="Document" element="cust:orderConfirmationAck" /> - </wsdl:message> - - <wsdl:portType name="CustomerPortType"> - <wsdl:operation name="SendOrderConfirmation"> - <wsdl:input message="tns:SendOrderConfirmationRequest" /> - <wsdl:output message="tns:SendOrderConfirmationResponse" /> - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="CustomerSoap" type="tns:CustomerPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="SendOrderConfirmation"> - <soap:operation - soapAction="http://www.jboss.org/samples/bpel/Customer.wsdl/SendOrde... - 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"> - <wsdl:port name="CustomerSoap" binding="tns:CustomerSoap"> - <soap:address - location="http://localhost:8080/bpel/processes/ABI_Customer" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Customer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="Customer" + targetNamespace="http://www.jboss.org/samples/bpel/Customer.wsdl" + xmlns:tns="http://www.jboss.org/samples/bpel/Customer.wsdl" + xmlns:cust="http://www.jboss.org/samples/bpel/Customer.xsd" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <!--<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import + namespace="http://www.jboss.org/samples/bpel/Customer.xsd" + schemaLocation="../schema/Customer.xsd" /> + </xs:schema>--> + </wsdl:types> + + <wsdl:message name="SendOrderConfirmationRequest"> + <wsdl:part name="Document" element="cust:orderConfirmation" /> + </wsdl:message> + + <wsdl:message name="SendOrderConfirmationResponse"> + <wsdl:part name="Document" element="cust:orderConfirmationAck" /> + </wsdl:message> + + <wsdl:portType name="CustomerPortType"> + <wsdl:operation name="SendOrderConfirmation"> + <wsdl:input message="tns:SendOrderConfirmationRequest" /> + <wsdl:output message="tns:SendOrderConfirmationResponse" /> + </wsdl:operation> + + </wsdl:portType> + + <wsdl:binding name="CustomerSoap" type="tns:CustomerPortType"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="SendOrderConfirmation"> + <soap:operation + soapAction="http://www.jboss.org/samples/bpel/Customer.wsdl/SendOrde... + 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"> + <wsdl:port name="CustomerSoap" binding="tns:CustomerSoap"> + <soap:address + location="http://localhost:8080/bpel/processes/ABI_Customer" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,264 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name="OrderManagerPortTypeService" - targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" - xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" - xmlns:ns1="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" - xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns="http://schemas.xmlsoap.org/wsdl/"> - <types> - <schema elementFormDefault="qualified" - targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <!--<import namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - schemaLocation="../schema/CustomerOrder.xsd" />--> - - <!-- - <complexType name="CancelOrder"> - <sequence> - <element name="orderInquiry" nillable="true" - type="ns2:OrderInquiry" /> - </sequence> - </complexType> - <complexType name="CustomerOrder"> - <sequence> - <element name="header" nillable="true" - type="ns2:OrderHeader" /> - <element maxOccurs="unbounded" minOccurs="0" - name="items" nillable="true" type="ns2:Item" /> - </sequence> - </complexType> - --> - <complexType name="SalesOrderFault"> - <sequence> - <element name="reason" nillable="true" - type="string" /> - </sequence> - </complexType> - - <complexType name="SalesOrderNotification"> - <sequence> - <element ref="tns:orderNumber" /> - </sequence> - </complexType> - - <element name="cancelOrder" type="ns1:CancelOrder" /> - <element name="cancelOrderResponse" type="boolean" /> - <element name="customerOrder" type="ns1:CustomerOrder" /> - <element name="SalesOrderFault" type="tns:SalesOrderFault" /> - <element name="customerOrderResponse" type="string" /> - <element name="salesOrderNotification" - type="tns:SalesOrderNotification" /> - <element name="salesOrderNotificationAck" type="boolean" /> - <element name="orderNumber" type="string" /> - </schema> - - <!-- - <schema elementFormDefault="qualified" - targetNamespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd... - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <import - namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" /> - <complexType name="Address"> - <sequence> - <element name="city" nillable="true" type="string" /> - <element name="state" nillable="true" type="string" /> - <element name="street1" nillable="true" - type="string" /> - <element name="street2" nillable="true" - type="string" /> - <element name="zip" nillable="true" type="string" /> - </sequence> - </complexType> - <complexType name="Contact"> - <sequence> - <element name="email" nillable="true" type="string" /> - <element name="fax" nillable="true" type="string" /> - <element name="name" nillable="true" type="string" /> - <element name="phone" nillable="true" type="string" /> - </sequence> - </complexType> - <complexType name="Item"> - <sequence> - <element name="description" nillable="true" - type="string" /> - <element name="extensionAmount" nillable="true" - type="decimal" /> - <element name="partNumber" nillable="true" - type="string" /> - <element name="price" nillable="true" - type="decimal" /> - <element name="quantity" type="int" /> - </sequence> - </complexType> - <complexType name="OrderHeader"> - <sequence> - <element name="billTerms" nillable="true" - type="string" /> - <element name="billTo" nillable="true" - type="tns:Party" /> - <element name="customerNumber" nillable="true" - type="string" /> - <element name="orderDate" nillable="true" - type="dateTime" /> - <element name="orderTotal" nillable="true" - type="decimal" /> - <element name="poNumber" nillable="true" - type="string" /> - <element name="shipTerms" nillable="true" - type="string" /> - <element name="shipTo" nillable="true" - type="tns:Party" /> - </sequence> - </complexType> - <complexType name="OrderInquiry"> - <sequence> - <element name="customerNumber" nillable="true" - type="string" /> - <element name="poNumber" nillable="true" - type="string" /> - </sequence> - </complexType> - <complexType name="Party"> - <sequence> - <element name="address" nillable="true" - type="tns:Address" /> - <element name="company" nillable="true" - type="string" /> - <element name="contact" nillable="true" - type="tns:Contact" /> - </sequence> - </complexType> - </schema> - --> - </types> - - <message name="OrderManagerPortType_customerOrder"> - <part name="parameters" element="tns:customerOrder" /> - </message> - <message name="SendSalesOrderNotificationResponse"> - <part name="Document" element="tns:salesOrderNotificationAck" /> - </message> - <message name="OrderManagerPortType_cancelOrderResponse"> - <part name="result" element="tns:cancelOrderResponse" /> - </message> - <message name="SendSalesOrderNotificationRequest"> - <part name="Document" element="tns:salesOrderNotification" /> - </message> - <message name="OrderManagerPortType_customerOrderResponse"> - <part name="result" element="tns:customerOrderResponse" /> - </message> - <message name="SalesOrderFault"> - <part name="SalesOrderFault" element="tns:SalesOrderFault" /> - </message> - <message name="OrderManagerPortType_cancelOrder"> - <part name="parameters" element="tns:cancelOrder" /> - </message> - <portType name="OrderManagerPortType"> - <operation name="cancelOrder"> - <input message="tns:OrderManagerPortType_cancelOrder" /> - <output - message="tns:OrderManagerPortType_cancelOrderResponse" /> - </operation> - <operation name="customerOrder"> - <input message="tns:OrderManagerPortType_customerOrder" /> - <output - message="tns:OrderManagerPortType_customerOrderResponse" /> - <fault name="SalesOrder" message="tns:SalesOrderFault" /> - </operation> - </portType> - <portType name="RetailerCallbackPortType"> - <operation name="SendSalesOrderNotification"> - <input message="tns:SendSalesOrderNotificationRequest" /> - <output message="tns:SendSalesOrderNotificationResponse" /> - </operation> - </portType> - <binding name="OrderManagerPortTypeBinding" - type="tns:OrderManagerPortType"> - <soap:binding xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <operation name="cancelOrder"> - <soap:operation - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="" /> - <input> - <soap:body - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> - </input> - <output> - <soap:body - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> - </output> - </operation> - <operation name="customerOrder"> - <soap:operation - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="" /> - <input> - <soap:body - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> - </input> - <output> - <soap:body - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> - </output> - <fault name="SalesOrder"> - <soap:fault - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - name="SalesOrder" use="literal" /> - </fault> - </operation> - </binding> - <binding name="RetailerCallbackSoap" - type="tns:RetailerCallbackPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> - <operation name="SendSalesOrderNotification"> - <soap:operation - soapAction="http://www.jboss.org/samples/bpel/OrderManager.wsdl/Send... - style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> - <input> - <soap:body use="literal" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> - </input> - <output> - <soap:body use="literal" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> - </output> - </operation> - </binding> - <service name="RetailerCallbackService"> - <port name="RetailerCallbackSoap" - binding="tns:RetailerCallbackSoap"> - <soap:address - location="http://localhost:8080/bpel/processes/RetailerCallback" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> - </port> - </service> - <service name="OrderManagerPortTypeService"> - <port name="OrderManagerPortTypePort" - binding="tns:OrderManagerPortTypeBinding"> - <soap:address - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - location="http://localhost:8865" /> - </port> - </service> - <plnk:partnerLinkType - xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" - name="OrderingPLT"> - <plnk:role name="OrderingSystem" - portType="tns:OrderManagerPortType" /> - <plnk:role name="OrderPlacer" - portType="tns:RetailerCallbackPortType" /> - </plnk:partnerLinkType> - - -</definitions> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/OrderManager.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="OrderManagerPortTypeService" + targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" + xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" + xmlns:ns1="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <schema elementFormDefault="qualified" + targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" + xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns2="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <!--<import namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + schemaLocation="../schema/CustomerOrder.xsd" />--> + + <!-- + <complexType name="CancelOrder"> + <sequence> + <element name="orderInquiry" nillable="true" + type="ns2:OrderInquiry" /> + </sequence> + </complexType> + <complexType name="CustomerOrder"> + <sequence> + <element name="header" nillable="true" + type="ns2:OrderHeader" /> + <element maxOccurs="unbounded" minOccurs="0" + name="items" nillable="true" type="ns2:Item" /> + </sequence> + </complexType> + --> + <complexType name="SalesOrderFault"> + <sequence> + <element name="reason" nillable="true" + type="string" /> + </sequence> + </complexType> + + <complexType name="SalesOrderNotification"> + <sequence> + <element ref="tns:orderNumber" /> + </sequence> + </complexType> + + <element name="cancelOrder" type="ns1:CancelOrder" /> + <element name="cancelOrderResponse" type="boolean" /> + <element name="customerOrder" type="ns1:CustomerOrder" /> + <element name="SalesOrderFault" type="tns:SalesOrderFault" /> + <element name="customerOrderResponse" type="string" /> + <element name="salesOrderNotification" + type="tns:SalesOrderNotification" /> + <element name="salesOrderNotificationAck" type="boolean" /> + <element name="orderNumber" type="string" /> + </schema> + + <!-- + <schema elementFormDefault="qualified" + targetNamespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd... + xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <import + namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" /> + <complexType name="Address"> + <sequence> + <element name="city" nillable="true" type="string" /> + <element name="state" nillable="true" type="string" /> + <element name="street1" nillable="true" + type="string" /> + <element name="street2" nillable="true" + type="string" /> + <element name="zip" nillable="true" type="string" /> + </sequence> + </complexType> + <complexType name="Contact"> + <sequence> + <element name="email" nillable="true" type="string" /> + <element name="fax" nillable="true" type="string" /> + <element name="name" nillable="true" type="string" /> + <element name="phone" nillable="true" type="string" /> + </sequence> + </complexType> + <complexType name="Item"> + <sequence> + <element name="description" nillable="true" + type="string" /> + <element name="extensionAmount" nillable="true" + type="decimal" /> + <element name="partNumber" nillable="true" + type="string" /> + <element name="price" nillable="true" + type="decimal" /> + <element name="quantity" type="int" /> + </sequence> + </complexType> + <complexType name="OrderHeader"> + <sequence> + <element name="billTerms" nillable="true" + type="string" /> + <element name="billTo" nillable="true" + type="tns:Party" /> + <element name="customerNumber" nillable="true" + type="string" /> + <element name="orderDate" nillable="true" + type="dateTime" /> + <element name="orderTotal" nillable="true" + type="decimal" /> + <element name="poNumber" nillable="true" + type="string" /> + <element name="shipTerms" nillable="true" + type="string" /> + <element name="shipTo" nillable="true" + type="tns:Party" /> + </sequence> + </complexType> + <complexType name="OrderInquiry"> + <sequence> + <element name="customerNumber" nillable="true" + type="string" /> + <element name="poNumber" nillable="true" + type="string" /> + </sequence> + </complexType> + <complexType name="Party"> + <sequence> + <element name="address" nillable="true" + type="tns:Address" /> + <element name="company" nillable="true" + type="string" /> + <element name="contact" nillable="true" + type="tns:Contact" /> + </sequence> + </complexType> + </schema> + --> + </types> + + <message name="OrderManagerPortType_customerOrder"> + <part name="parameters" element="tns:customerOrder" /> + </message> + <message name="SendSalesOrderNotificationResponse"> + <part name="Document" element="tns:salesOrderNotificationAck" /> + </message> + <message name="OrderManagerPortType_cancelOrderResponse"> + <part name="result" element="tns:cancelOrderResponse" /> + </message> + <message name="SendSalesOrderNotificationRequest"> + <part name="Document" element="tns:salesOrderNotification" /> + </message> + <message name="OrderManagerPortType_customerOrderResponse"> + <part name="result" element="tns:customerOrderResponse" /> + </message> + <message name="SalesOrderFault"> + <part name="SalesOrderFault" element="tns:SalesOrderFault" /> + </message> + <message name="OrderManagerPortType_cancelOrder"> + <part name="parameters" element="tns:cancelOrder" /> + </message> + <portType name="OrderManagerPortType"> + <operation name="cancelOrder"> + <input message="tns:OrderManagerPortType_cancelOrder" /> + <output + message="tns:OrderManagerPortType_cancelOrderResponse" /> + </operation> + <operation name="customerOrder"> + <input message="tns:OrderManagerPortType_customerOrder" /> + <output + message="tns:OrderManagerPortType_customerOrderResponse" /> + <fault name="SalesOrder" message="tns:SalesOrderFault" /> + </operation> + </portType> + <portType name="RetailerCallbackPortType"> + <operation name="SendSalesOrderNotification"> + <input message="tns:SendSalesOrderNotificationRequest" /> + <output message="tns:SendSalesOrderNotificationResponse" /> + </operation> + </portType> + <binding name="OrderManagerPortTypeBinding" + type="tns:OrderManagerPortType"> + <soap:binding xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + style="document" transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="cancelOrder"> + <soap:operation + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="" /> + <input> + <soap:body + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> + </input> + <output> + <soap:body + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> + </output> + </operation> + <operation name="customerOrder"> + <soap:operation + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="" /> + <input> + <soap:body + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> + </input> + <output> + <soap:body + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal" /> + </output> + <fault name="SalesOrder"> + <soap:fault + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + name="SalesOrder" use="literal" /> + </fault> + </operation> + </binding> + <binding name="RetailerCallbackSoap" + type="tns:RetailerCallbackPortType"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> + <operation name="SendSalesOrderNotification"> + <soap:operation + soapAction="http://www.jboss.org/samples/bpel/OrderManager.wsdl/Send... + style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> + <input> + <soap:body use="literal" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> + </input> + <output> + <soap:body use="literal" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> + </output> + </operation> + </binding> + <service name="RetailerCallbackService"> + <port name="RetailerCallbackSoap" + binding="tns:RetailerCallbackSoap"> + <soap:address + location="http://localhost:8080/bpel/processes/RetailerCallback" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" /> + </port> + </service> + <service name="OrderManagerPortTypeService"> + <port name="OrderManagerPortTypePort" + binding="tns:OrderManagerPortTypeBinding"> + <soap:address + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + location="http://localhost:8865" /> + </port> + </service> + <plnk:partnerLinkType + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + name="OrderingPLT"> + <plnk:role name="OrderingSystem" + portType="tns:OrderManagerPortType" /> + <plnk:role name="OrderPlacer" + portType="tns:RetailerCallbackPortType" /> + </plnk:partnerLinkType> + + +</definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="Retailer" - targetNamespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" - xmlns:tns="http://www.jboss.org/samples/bpel/Retailer.wsdl" - xmlns:cust="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <!--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import - namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - schemaLocation="../schema/CustomerOrder.xsd" /> - </xsd:schema>--> - </wsdl:types> - - <wsdl:message name="SubmitOrderRequest"> - <wsdl:part name="Document" element="cust:customerOrder" /> - </wsdl:message> - - <wsdl:message name="SubmitOrderResponse"> - <wsdl:part name="Document" element="cust:customerOrderAck" /> - </wsdl:message> - - <wsdl:portType name="RetailerPortType"> - <wsdl:operation name="SubmitOrder"> - <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" - transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="SubmitOrder"> - <soap:operation - soapAction="http://www.jboss.org/samples/bpel/Retailer.wsdl/SubmitOr... /> - <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"> - <soap:address location="http://localhost:8080/bpel/processes/Retailer" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Retailer.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="Retailer" + targetNamespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" + xmlns:tns="http://www.jboss.org/samples/bpel/Retailer.wsdl" + xmlns:cust="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:types> + <!--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <xsd:import + namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + schemaLocation="../schema/CustomerOrder.xsd" /> + </xsd:schema>--> + </wsdl:types> + + <wsdl:message name="SubmitOrderRequest"> + <wsdl:part name="Document" element="cust:customerOrder" /> + </wsdl:message> + + <wsdl:message name="SubmitOrderResponse"> + <wsdl:part name="Document" element="cust:customerOrderAck" /> + </wsdl:message> + + <wsdl:portType name="RetailerPortType"> + <wsdl:operation name="SubmitOrder"> + <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" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="SubmitOrder"> + <soap:operation + soapAction="http://www.jboss.org/samples/bpel/Retailer.wsdl/SubmitOr... /> + <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"> + <soap:address location="http://localhost:8080/bpel/processes/Retailer" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl 2009-10-12 17:04:17 UTC (rev 10895) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" - name="ShippingPortTypeService" - targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"> - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - elementFormDefault="qualified" - targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" - xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"> - <complexType name="ShippingRequest"> - <sequence> - <element name="customerNumber" nillable="true" - type="string" /> - <element name="orderNumber" nillable="true" - type="string" /> - <element name="poNumber" nillable="true" - type="string" /> - </sequence> - </complexType> - <complexType name="ShippingResponse"> - <sequence> - <element name="orderShipped" type="boolean" /> - </sequence> - </complexType> - <element name="shippingRequest" type="tns:ShippingRequest" /> - <element name="shippingRequestResponse" - type="tns:ShippingResponse" /> - </schema> - </types> - <message name="ShippingPortType_shippingRequest"> - <part element="tns:shippingRequest" name="parameters" /> - </message> - <message name="ShippingPortType_shippingRequestResponse"> - <part element="tns:shippingRequestResponse" name="result" /> - </message> - <portType name="ShippingPortType"> - <operation name="shippingRequest"> - <input message="tns:ShippingPortType_shippingRequest" /> - <output - message="tns:ShippingPortType_shippingRequestResponse" /> - </operation> - </portType> - <binding name="ShippingPortTypeBinding" - type="tns:ShippingPortType"> - <soap:binding style="document" - transport="http://schemas.xmlsoap.org/soap/http" /> - <operation name="shippingRequest"> - <soap:operation soapAction="" /> - <input> - <soap:body use="literal" /> - </input> - <output> - <soap:body use="literal" /> - </output> - </operation> - </binding> - <service name="ShippingPortTypeService"> - <port binding="tns:ShippingPortTypeBinding" - name="ShippingPortTypePort"> - <soap:address location="http://localhost:8866" /> - </port> - </service> - - <plnk:partnerLinkType name="ShippingPLT"> - <plnk:role name="Shipper" portType="tns:ShippingPortType" /> - </plnk:partnerLinkType> - -</definitions> Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl (from rev 10895, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2784/META-INF/wsdl/Shipping.wsdl 2010-01-12 07:15:47 UTC (rev 11385) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + name="ShippingPortTypeService" + targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"> + <types> + <schema xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="qualified" + targetNamespace="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping" + xmlns:tns="http://org.jboss.esb/quickstarts/bpel/ABI_Shipping"> + <complexType name="ShippingRequest"> + <sequence> + <element name="customerNumber" nillable="true" + type="string" /> + <element name="orderNumber" nillable="true" + type="string" /> + <element name="poNumber" nillable="true" + type="string" /> + </sequence> + </complexType> + <complexType name="ShippingResponse"> + <sequence> + <element name="orderShipped" type="boolean" /> + </sequence> + </complexType> + <element name="shippingRequest" type="tns:ShippingRequest" /> + <element name="shippingRequestResponse" + type="tns:ShippingResponse" /> + </schema> + </types> + <message name="ShippingPortType_shippingRequest"> + <part element="tns:shippingRequest" name="parameters" /> + </message> + <message name="ShippingPortType_shippingRequestResponse"> + <part element="tns:shippingRequestResponse" name="result" /> + </message> + <portType name="ShippingPortType"> + <operation name="shippingRequest"> + <input message="tns:ShippingPortType_shippingRequest" /> + <output + message="tns:ShippingPortType_shippingRequestResponse" /> + </operation> + </portType> + <binding name="ShippingPortTypeBinding" + type="tns:ShippingPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="shippingRequest"> + <soap:operation soapAction="" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="ShippingPortTypeService"> + <port binding="tns:ShippingPortTypeBinding" + name="ShippingPortTypePort"> + <soap:address location="http://localhost:8866" /> + </port> + </service> + + <plnk:partnerLinkType name="ShippingPLT"> + <plnk:role name="Shipper" portType="tns:ShippingPortType" /> + </plnk:partnerLinkType> + +</definitions>