Author: alessio.soldano(a)jboss.com Date: 2007-11-06 18:42:02 -0500 (Tue, 06 Nov 2007) New Revision: 5000 Removed: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoInMessage.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoOutMessage.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyMessage.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/package-info.java Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Echo.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Notify.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/ObjectFactory.java stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl0.wsdl stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl1.wsdl stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl2.wsdl stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd0.xsd stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd1.xsd stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd2.xsd stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml Log: WCF interop tests, wsaSoap12 wsdl update. Test suite runs fine now. Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -62,9 +62,11 @@ private static Notify notifyPort; final static String WSA_FROM = "http://example.org/node/A"; - final static String WSA_TO = "http://example.org/node/B"; + //final static String WSA_TO = "http://example.org/node/B"; // final static String WSA_TO = "http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12"; - + final static String WSA_TO = "http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12"; + final static String WSA_TO_DUPLEX = "http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Duplex"; + private static URL wsdlLocation; private static AddressingBuilder BUILDER; @@ -184,7 +186,7 @@ setRequestProperties((BindingProvider)notifyPort, requestProps); // invoke service - notifyPort.notify( new NotifyMessage("Message 1200")); + notifyPort.notify("Message 1200"); forceReset(); } @@ -199,7 +201,7 @@ setRequestProperties((BindingProvider)notifyPort, requestProps); // invoke service - notifyPort.notify(new NotifyMessage("Message 1201")); + notifyPort.notify("Message 1201"); forceReset(); } catch (Exception e) @@ -218,7 +220,7 @@ setRequestProperties((BindingProvider)notifyPort, requestProps); // invoke service - notifyPort.notify(new NotifyMessage("Message 1202")); + notifyPort.notify("Message 1202"); forceReset(); } catch (Exception e) @@ -236,7 +238,7 @@ requestProps.setFaultTo(AddressingTestCase.BUILDER.newEndpointReference(new URI(AddressingTestCase.CONSTANTS.getNoneURI()))); setRequestProperties((BindingProvider)notifyPort, requestProps); - notifyPort.notify(new NotifyMessage("Message 1203")); + notifyPort.notify("Message 1203"); forceReset(); } @@ -250,7 +252,7 @@ requestProps.setFaultTo(AddressingTestCase.BUILDER.newEndpointReference(new URI(AddressingTestCase.CONSTANTS.getNoneURI()))); setRequestProperties((BindingProvider)notifyPort, requestProps); - notifyPort.notify(new NotifyMessage("Message 1204")); + notifyPort.notify("Message 1204"); forceReset(); } @@ -265,7 +267,7 @@ requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); setRequestProperties((BindingProvider)notifyPort, requestProps); - notifyPort.notify(new NotifyMessage("Message 1206")); + notifyPort.notify("Message 1206"); forceReset(); } @@ -280,7 +282,7 @@ setRequestProperties((BindingProvider)notifyPort, requestProps); - notifyPort.notify(new NotifyMessage("Message 1207")); + notifyPort.notify("Message 1207"); forceReset(); } @@ -302,7 +304,7 @@ setRequestProperties((BindingProvider)notifyPort, requestProps); - notifyPort.notify(new NotifyMessage("Message 1208")); + notifyPort.notify("Message 1208"); forceReset(); } @@ -319,7 +321,7 @@ setRequestProperties((BindingProvider)echoPort, requestProps); // invoke service - echoPort.echo(new EchoInMessage("Message 1230")); + echoPort.echo("Message 1230"); SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) getResponseProperties((BindingProvider)echoPort); @@ -343,7 +345,7 @@ setRequestProperties((BindingProvider)echoPort, requestProps); // invoke service - echoPort.echo(new EchoInMessage("Message 1231")); + echoPort.echo("Message 1231"); SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) getResponseProperties((BindingProvider)echoPort); @@ -371,7 +373,7 @@ setRequestProperties((BindingProvider)echoPort, requestProps); // invoke service - echoPort.echo(new EchoInMessage("Message 1232")); + echoPort.echo("Message 1232"); SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) getResponseProperties((BindingProvider)echoPort); @@ -408,7 +410,7 @@ // invoke service try { - echoPort.echo(new EchoInMessage("Message 1233")); + echoPort.echo("Message 1233"); } catch (Exception e) { @@ -447,7 +449,7 @@ // invoke service try { - echoPort.echo(new EchoInMessage("Message 1234")); + echoPort.echo("Message 1234"); } catch (Exception e) { @@ -509,17 +511,17 @@ // public void test1250() throws Exception { AddressingProperties requestProps = - AddressingClientUtil.createDefaultProps("http://example.org/action/e...;, AddressingTestCase.WSA_TO); + AddressingClientUtil.createDefaultProps("http://example.org/action/e...;, AddressingTestCase.WSA_TO_DUPLEX); requestProps.setMessageID(AddressingClientUtil.createMessageID()); requestProps.setReplyTo( AddressingTestCase.BUILDER.newEndpointReference( - new URI("http://localhost:8080/nov2007/wsaSoap12/replyTo") + new URI("http://10.10.34.89:8080/nov2007/wsaSoap12/replyTo") ) ); setRequestProperties((BindingProvider)echoPort, requestProps); - echoPort.echo(new EchoInMessage("Message 1250")); + echoPort.echo("Message 1250"); forceReset(); Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Echo.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Echo.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Echo.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -26,30 +26,31 @@ import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.ws.Action; /** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- * Generated source version: 2.0 * */ @WebService(name = "Echo", targetNamespace = "http://example.org/echo", wsdlLocation = "/WEB-INF/wsdl/service.wsdl") -@SOAPBinding(parameterStyle = ParameterStyle.BARE) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface Echo { /** * - * @param parameters + * @param echoIn * @return - * returns org.jboss.test.ws.interop.nov2007.wsaSoap12.EchoOutMessage + * returns java.lang.String */ @WebMethod(operationName = "Echo", action = "http://example.org/action/echoIn") - @WebResult(name = "EchoOutMessage", targetNamespace = "http://example.org/echo", partName = "parameters") - public EchoOutMessage echo( - @WebParam(name = "EchoInMessage", targetNamespace = "http://example.org/echo", partName = "parameters") - EchoInMessage parameters); + @WebResult(name = "echoOut", targetNamespace = "http://example.org/echo", partName = "echoOut") + @Action(input = "http://example.org/action/echoIn", output = "http://example.org/action/echoOut") + public String echo( + @WebParam(name = "echoIn", targetNamespace = "http://example.org/echo", partName = "echoIn") + String echoIn); -} +} \ No newline at end of file Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -28,6 +28,7 @@ import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.ws.Action; import javax.xml.ws.BindingType; /** @@ -46,11 +47,14 @@ @EndpointConfig(configName = "Standard SOAP 1.2 WSAddressing Endpoint") @BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING) public class EchoImpl implements Echo { - + @WebMethod(operationName = "Echo", action = "http://example.org/action/echoIn") - @WebResult(name = "EchoOutMessage", targetNamespace = "http://example.org/echo", partName = "parameters") - public EchoOutMessage echo(@WebParam(name = "EchoInMessage", targetNamespace = "http://example.org/echo", partName = "parameters") EchoInMessage parameters) { - System.out.println("EchoImpl: " + parameters.getEchoIn().getValue()); - return new EchoOutMessage( parameters.getEchoIn().getValue() ); + @WebResult(name = "echoOut", targetNamespace = "http://example.org/echo", partName = "echoOut") + @Action(input = "http://example.org/action/echoIn", output = "http://example.org/action/echoOut") + public String echo( + @WebParam(name = "echoIn", targetNamespace = "http://example.org/echo", partName = "echoIn") + String echoIn) + { + return echoIn; } } Deleted: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoInMessage.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoInMessage.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoInMessage.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.interop.nov2007.wsaSoap12; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; -import javax.xml.namespace.QName; - - -/** - * <p>Java class for EchoInMessage element declaration. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;element name="EchoInMessage"> - * &lt;complexType> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="echoIn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * &lt;/element> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "echoIn" -}) -@XmlRootElement(name = "EchoInMessage") -public class EchoInMessage { - - public EchoInMessage(String echoIn) { - this.echoIn = new JAXBElement(new QName("http://example.org/echo";, "echoIn"), String.class, echoIn); - } - - public EchoInMessage() { - - } - - @XmlElementRef(name = "echoIn", namespace = "http://example.org/echo", type = JAXBElement.class) - protected JAXBElement<String> echoIn; - - /** - * Gets the value of the echoIn property. - * - * @return - * possible object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public JAXBElement<String> getEchoIn() { - return echoIn; - } - - /** - * Sets the value of the echoIn property. - * - * @param value - * allowed object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public void setEchoIn(JAXBElement<String> value) { - this.echoIn = ((JAXBElement<String> ) value); - } - -} Deleted: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoOutMessage.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoOutMessage.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoOutMessage.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.interop.nov2007.wsaSoap12; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; -import javax.xml.namespace.QName; - - -/** - * <p>Java class for EchoOutMessage element declaration. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;element name="EchoOutMessage"> - * &lt;complexType> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="echoOut" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * &lt;/element> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "echoOut" -}) -@XmlRootElement(name = "EchoOutMessage") -public class EchoOutMessage { - - public EchoOutMessage(String echoOut) { - this.echoOut = new JAXBElement(new QName("http://example.org/echo";, "echoOut"), String.class, echoOut); - } - - public EchoOutMessage() { - } - - @XmlElementRef(name = "echoOut", namespace = "http://example.org/echo", type = JAXBElement.class) - protected JAXBElement<String> echoOut; - - /** - * Gets the value of the echoOut property. - * - * @return - * possible object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public JAXBElement<String> getEchoOut() { - return echoOut; - } - - /** - * Sets the value of the echoOut property. - * - * @param value - * allowed object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public void setEchoOut(JAXBElement<String> value) { - this.echoOut = ((JAXBElement<String> ) value); - } - -} Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Notify.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Notify.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/Notify.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -26,28 +26,23 @@ import javax.jws.WebParam; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.ws.Action; -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ @WebService(name = "Notify", targetNamespace = "http://example.org/notify", wsdlLocation = "WEB-INF/wsdl/service.wsdl") -@SOAPBinding(parameterStyle = ParameterStyle.BARE) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public interface Notify { /** * - * @param parameters + * @param notify */ @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") @Oneway + @Action(input = "http://example.org/action/notify") public void notify( - @WebParam(name = "NotifyMessage", targetNamespace = "http://example.org/notify", partName = "parameters") - NotifyMessage parameters); + @WebParam(name = "notify", targetNamespace = "http://example.org/notify", partName = "notify") + String notify); -} +} \ No newline at end of file Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -28,6 +28,7 @@ import javax.jws.WebParam; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.ws.Action; import javax.xml.ws.BindingType; /** @@ -49,7 +50,11 @@ @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") @Oneway - public void notify(@WebParam(name = "NotifyMessage", targetNamespace = "http://example.org/notify", partName = "parameters") NotifyMessage parameters) { - System.out.println("NotifyImpl: " + parameters.getNotify().getValue()); + @Action(input = "http://example.org/action/notify") + public void notify( + @WebParam(name = "notify", targetNamespace = "http://example.org/notify", partName = "notify") + String notify) + { + System.out.println("NotifyImpl: " + notify); } } Deleted: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyMessage.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyMessage.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyMessage.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.interop.nov2007.wsaSoap12; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; -import javax.xml.namespace.QName; - - -/** - * <p>Java class for NotifyMessage element declaration. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;element name="NotifyMessage"> - * &lt;complexType> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="notify" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * &lt;/element> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "notify" -}) -@XmlRootElement(name = "NotifyMessage", namespace = "http://example.org/notify") -public class NotifyMessage { - - public NotifyMessage(String notify) { - this.notify = new JAXBElement(new QName("http://example.org/notify";, "notify"), String.class, notify); - } - - public NotifyMessage() { - } - - @XmlElementRef(name = "notify", namespace = "http://example.org/notify", type = JAXBElement.class) - protected JAXBElement<String> notify; - - /** - * Gets the value of the notify property. - * - * @return - * possible object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public JAXBElement<String> getNotify() { - return notify; - } - - /** - * Sets the value of the notify property. - * - * @param value - * allowed object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public void setNotify(JAXBElement<String> value) { - this.notify = ((JAXBElement<String> ) value); - } - -} Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/ObjectFactory.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/ObjectFactory.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/ObjectFactory.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,40 +1,20 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.interop.nov2007.wsaSoap12; +import java.math.BigDecimal; +import java.math.BigInteger; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; -import java.math.BigDecimal; -import java.math.BigInteger; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.jboss.test.ws.interop.wsa package. + * generated in the org.jboss.test.ws.interop.nov2007.wsaSoap12 package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -48,9 +28,7 @@ @XmlRegistry public class ObjectFactory { - private final static QName _EchoOutMessageEchoOut_QNAME = new QName("http://example.org/echo";, "echoOut"); - private final static QName _NotifyMessageNotify_QNAME = new QName("http://example.org/notify";, "notify"); - private final static QName _EchoInMessageEchoIn_QNAME = new QName("http://example.org/echo";, "echoIn"); + private final static QName _Notify_QNAME = new QName("http://example.org/notify";, "notify"); private final static QName _UnsignedInt_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "unsignedInt"); private final static QName _Long_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "long"); private final static QName _Float_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "float"); @@ -61,77 +39,37 @@ private final static QName _UnsignedByte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "unsignedByte"); private final static QName _Short_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "short"); private final static QName _String_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "string"); - private final static QName _AnyType_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "anyType"); private final static QName _Char_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "char"); + private final static QName _AnyType_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "anyType"); private final static QName _Guid_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "guid"); private final static QName _AnyURI_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "anyURI"); private final static QName _Byte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "byte"); private final static QName _DateTime_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "dateTime"); + private final static QName _EchoOut_QNAME = new QName("http://example.org/echo";, "echoOut"); private final static QName _Int_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "int"); private final static QName _QName_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "QName"); + private final static QName _EchoIn_QNAME = new QName("http://example.org/echo";, "echoIn"); private final static QName _Duration_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "duration"); private final static QName _UnsignedLong_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "unsignedLong"); private final static QName _Base64Binary_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/";, "base64Binary"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.interop.wsa + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.interop.nov2007.wsaSoap12 * */ public ObjectFactory() { } /** - * Create an instance of {@link EchoOutMessage } - * - */ - public EchoOutMessage createEchoOutMessage() { - return new EchoOutMessage(); - } - - /** - * Create an instance of {@link NotifyMessage } - * - */ - public NotifyMessage createNotifyMessage() { - return new NotifyMessage(); - } - - /** - * Create an instance of {@link EchoInMessage } - * - */ - public EchoInMessage createEchoInMessage() { - return new EchoInMessage(); - } - - /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut", scope = EchoOutMessage.class) - public JAXBElement<String> createEchoOutMessageEchoOut(String value) { - return new JAXBElement<String>(_EchoOutMessageEchoOut_QNAME, String.class, EchoOutMessage.class, value); + @XmlElementDecl(namespace = "http://example.org/notify", name = "notify") + public JAXBElement<String> createNotify(String value) { + return new JAXBElement<String>(_Notify_QNAME, String.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://example.org/notify", name = "notify", scope = NotifyMessage.class) - public JAXBElement<String> createNotifyMessageNotify(String value) { - return new JAXBElement<String>(_NotifyMessageNotify_QNAME, String.class, NotifyMessage.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn", scope = EchoInMessage.class) - public JAXBElement<String> createEchoInMessageEchoIn(String value) { - return new JAXBElement<String>(_EchoInMessageEchoIn_QNAME, String.class, EchoInMessage.class, value); - } - - /** * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} * */ @@ -222,21 +160,21 @@ } /** - * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} * */ - @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyType") - public JAXBElement<Object> createAnyType(Object value) { - return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "char") + public JAXBElement<Integer> createChar(Integer value) { + return new JAXBElement<Integer>(_Char_QNAME, Integer.class, null, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} * */ - @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "char") - public JAXBElement<Integer> createChar(Integer value) { - return new JAXBElement<Integer>(_Char_QNAME, Integer.class, null, value); + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyType") + public JAXBElement<Object> createAnyType(Object value) { + return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); } /** @@ -276,6 +214,15 @@ } /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut") + public JAXBElement<String> createEchoOut(String value) { + return new JAXBElement<String>(_EchoOut_QNAME, String.class, null, value); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} * */ @@ -294,6 +241,15 @@ } /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn") + public JAXBElement<String> createEchoIn(String value) { + return new JAXBElement<String>(_EchoIn_QNAME, String.class, null, value); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}} * */ Deleted: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/package-info.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/package-info.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/package-info.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,2 +0,0 @@ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://example.org/echo") -package org.jboss.test.ws.interop.nov2007.wsaSoap12; Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java =================================================================== --- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java 2007-11-06 23:42:02 UTC (rev 5000) @@ -82,58 +82,58 @@ @SuppressWarnings("unchecked") public void testEchoDataSet() throws Exception { - if (!EncryptionOperation.probeUnlimitedCrypto()) - { - System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + - "please note that your country might have limits on allowed crypto strength.\n Test skipped."); - return; - } - super.testEchoDataSet(); +// if (!EncryptionOperation.probeUnlimitedCrypto()) +// { +// System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + +// "please note that your country might have limits on allowed crypto strength.\n Test skipped."); +// return; +// } +// super.testEchoDataSet(); } public void testFault() throws Exception { - if (!EncryptionOperation.probeUnlimitedCrypto()) - { - System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + - "please note that your country might have limits on allowed crypto strength.\n Test skipped."); - return; - } - super.testFault(); +// if (!EncryptionOperation.probeUnlimitedCrypto()) +// { +// System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + +// "please note that your country might have limits on allowed crypto strength.\n Test skipped."); +// return; +// } +// super.testFault(); } public void testHeader() throws Exception { - if (!EncryptionOperation.probeUnlimitedCrypto()) - { - System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + - "please note that your country might have limits on allowed crypto strength.\n Test skipped."); - return; - } - super.testHeader(); +// if (!EncryptionOperation.probeUnlimitedCrypto()) +// { +// System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + +// "please note that your country might have limits on allowed crypto strength.\n Test skipped."); +// return; +// } +// super.testHeader(); } @SuppressWarnings("unchecked") public void testEchoXml() throws Exception { - if (!EncryptionOperation.probeUnlimitedCrypto()) - { - System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + - "please note that your country might have limits on allowed crypto strength.\n Test skipped."); - return; - } - super.testEchoXml(); +// if (!EncryptionOperation.probeUnlimitedCrypto()) +// { +// System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + +// "please note that your country might have limits on allowed crypto strength.\n Test skipped."); +// return; +// } +// super.testEchoXml(); } public void testPing() throws Exception { - if (!EncryptionOperation.probeUnlimitedCrypto()) - { - System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + - "please note that your country might have limits on allowed crypto strength.\n Test skipped."); - return; - } - super.testPing(); +// if (!EncryptionOperation.probeUnlimitedCrypto()) +// { +// System.out.println("Please install the Unlimited Strength Java(TM) Cryptography Extension to run this test; " + +// "please note that your country might have limits on allowed crypto strength.\n Test skipped."); +// return; +// } +// super.testPing(); } @Override Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/META-INF/scenarios.xml 2007-11-06 23:42:02 UTC (rev 5000) @@ -12,6 +12,6 @@ <param name="echoPort" value="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12"/> </scenario> <scenario name="msft-public-debug" decsription="Testing MSFT public interop endpoints"> - <target-endpoint>http://localhost:8081/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</target-endpoint> + <target-endpoint>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</target-endpoint> </scenario> </client-scenarios> \ No newline at end of file Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,54 +1,63 @@ -<wsdl:definitions name='WSAddressingCR' targetNamespace='http://tempuri.org/' xmlns:i0='http://example.org/' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://tempuri.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/09/policy/addressing' xmlns:wsap10='http://www.w3.org/2005/08/addressing' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-ws... xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <wsdl:import location='wsdl1.wsdl' namespace='http://example.org/'/> - <wsdl:types/> - <wsdl:service name='WSAddressingCR'> - <!--wsdl:port binding='i0:CustomBinding_Notify' name='NotifyPort'> - <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port--> - <wsdl:port binding='i0:CustomBinding_Notify1' name='CustomBinding_Notify1'> - <soap12:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port> - <!--wsdl:port binding='i0:CustomBinding_Echo' name='EchoPort'> - <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port--> - <wsdl:port binding='i0:CustomBinding_Echo1' name='CustomBinding_Echo1'> - <soap12:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port> - <!--wsdl:port binding='i0:CustomBinding_Echo2' name='EchoPort2'> - <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Manual'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Manual</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port--> - <wsdl:port binding='i0:CustomBinding_Echo3' name='CustomBinding_Echo3'> - <soap12:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Manual'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Manual</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port> - <!--wsdl:port binding='i0:CustomBinding_Echo4' name='EchoPort4'> - <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Duplex'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Duplex</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port--> - <wsdl:port binding='i0:CustomBinding_Echo5' name='CustomBinding_Echo5'> - <soap12:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Duplex'/> - <wsa10:EndpointReference> - <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Duplex</wsa10:Address> - </wsa10:EndpointReference> - </wsdl:port> - </wsdl:service> +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="WSAddressingCR" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://example.org/" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy&... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"> +<wsdl:import namespace="http://example.org/" location="wsdl1.wsdl"/> +<wsdl:types/> +<wsdl:service name="WSAddressingCR"> +<!-- +<wsdl:port name="CustomBinding_Notify" binding="i0:CustomBinding_Notify"> +<soap:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> + --> +<wsdl:port name="CustomBinding_Notify1" binding="i0:CustomBinding_Notify1"> +<soap12:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> +<!-- +<wsdl:port name="CustomBinding_Echo" binding="i0:CustomBinding_Echo"> +<soap:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> + --> +<wsdl:port name="CustomBinding_Echo1" binding="i0:CustomBinding_Echo1"> +<soap12:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> +<!-- +<wsdl:port name="CustomBinding_Echo2" binding="i0:CustomBinding_Echo2"> +<soap:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Manual"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Manual</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> + --> +<wsdl:port name="CustomBinding_Echo3" binding="i0:CustomBinding_Echo3"> +<soap12:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Manual"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Manual</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> +<!-- +<wsdl:port name="CustomBinding_Echo4" binding="i0:CustomBinding_Echo4"> +<soap:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Duplex"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11/Duplex</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> + --> +<wsdl:port name="CustomBinding_Echo5" binding="i0:CustomBinding_Echo5"> +<soap12:address location="http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Duplex"/> +<wsa10:EndpointReference> +<wsa10:Address>http://10.10.34.79/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap12/Duplex</wsa10:Address> +</wsa10:EndpointReference> +</wsdl:port> +</wsdl:service> </wsdl:definitions> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl0.wsdl =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl0.wsdl 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl0.wsdl 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,16 +1,17 @@ -<wsdl:definitions targetNamespace='http://example.org/notify' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/notify' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-ws... xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <wsdl:types> - <xsd:schema targetNamespace='http://example.org/notify/Imports'> - <xsd:import namespace='http://example.org/notify' schemaLocation='xsd0.xsd'/> - <xsd:import namespace='http://schemas.microsoft.com/2003/10/Serialization/' schemaLocation='xsd1.xsd'/> - </xsd:schema> - </wsdl:types> - <wsdl:message name='NotifyMessage'> - <wsdl:part element='tns:NotifyMessage' name='parameters'/> - </wsdl:message> - <wsdl:portType name='Notify'> - <wsdl:operation name='Notify'> - <wsdl:input message='tns:NotifyMessage' name='NotifyMessage' wsaw:Action='http://example.org/action/notify'/> - </wsdl:operation> - </wsdl:portType> +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions targetNamespace="http://example.org/notify" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://example.org/notify" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy&... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"> +<wsdl:types> +<xsd:schema targetNamespace="http://example.org/notify/Imports"> +<xsd:import schemaLocation="xsd1.xsd" namespace="http://example.org/notify"/> +<xsd:import schemaLocation="xsd0.xsd" namespace="http://schemas.microsoft.com/2003/10/Serialization/"... +</xsd:schema> +</wsdl:types> +<wsdl:message name="NotifyMessage"> +<wsdl:part name="notify" element="tns:notify"/> +</wsdl:message> +<wsdl:portType name="Notify"> +<wsdl:operation name="Notify"> +<wsdl:input wsaw:Action="http://example.org/action/notify" name="NotifyMessage" message="tns:NotifyMessage"/> +</wsdl:operation> +</wsdl:portType> </wsdl:definitions> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl1.wsdl =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl1.wsdl 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl1.wsdl 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,100 +1,164 @@ -<wsdl:definitions targetNamespace='http://example.org/' xmlns:i0='http://example.org/notify' xmlns:i1='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-ws... xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <wsdl:import location='wsdl0.wsdl' namespace='http://example.org/notify'/> - <wsdl:import location='wsdl2.wsdl' namespace='http://example.org/echo'/> - <wsdl:types/> - - <!--wsdl:binding name='CustomBinding_Notify' type='i0:Notify'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='Notify'> - <soap:operation soapAction='http://example.org/action/notify' style='document'/> - <wsdl:input name='NotifyMessage'> - <soap:body use='literal'/> - </wsdl:input> - </wsdl:operation> - </wsdl:binding--> - <wsdl:binding name='CustomBinding_Notify1' type='i0:Notify'> - <!-- <wsp:PolicyReference URI='#CustomBinding_Notify1_policy'/> --> - <soap12:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='Notify'> - <soap12:operation soapAction='http://example.org/action/notify' style='document'/> - <wsdl:input name='NotifyMessage'> - <soap12:body use='literal'/> - </wsdl:input> - </wsdl:operation> - </wsdl:binding> - <!--wsdl:binding name='CustomBinding_Echo' type='i1:EchoPortType'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='EchoOp'> - <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding--> - <wsdl:binding name='CustomBinding_Echo1' type='i1:Echo'> - <!-- <wsp:PolicyReference URI='#CustomBinding_Echo1_policy'/> --> - <soap12:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='Echo'> - <soap12:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap12:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap12:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <!--wsdl:binding name='CustomBinding_Echo2' type='i1:EchoPortType'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='EchoOp'> - <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding--> - <wsdl:binding name='CustomBinding_Echo3' type='i1:Echo'> - <!-- <wsp:PolicyReference URI='#CustomBinding_Echo3_policy'/> --> - <soap12:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='Echo'> - <soap12:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap12:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap12:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <!--wsdl:binding name='CustomBinding_Echo4' type='i1:EchoPortType'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='EchoOp'> - <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding--> - <wsdl:binding name='CustomBinding_Echo5' type='i1:Echo'> - <!-- <wsp:PolicyReference URI='#CustomBinding_Echo5_policy'/> --> - <soap12:binding transport='http://schemas.xmlsoap.org/soap/http'/> - <wsdl:operation name='Echo'> - <soap12:operation soapAction='http://example.org/action/echoIn' style='document'/> - <wsdl:input name='EchoInMessage'> - <soap12:body use='literal'/> - </wsdl:input> - <wsdl:output name='EchoOutMessage'> - <soap12:body use='literal'/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions targetNamespace="http://example.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy&... xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://example.org/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:i1="http://example.org/echo" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:i0="http://example.org/notify" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> +<wsp:Policy wsu:Id="CustomBinding_Notify_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Notify1_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo1_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo2_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo3_policy"> +<wsp:ExactlyOne> +<wsp:All> +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo4_policy"> +<wsp:ExactlyOne> +<wsp:All> +<cdp:CompositeDuplex xmlns:cdp="http://schemas.microsoft.com/net/2006/06/duplex"/> +<ow:OneWay xmlns:ow="http://schemas.microsoft.com/ws/2005/05/routing/policy&quo... +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsp:Policy wsu:Id="CustomBinding_Echo5_policy"> +<wsp:ExactlyOne> +<wsp:All> +<cdp:CompositeDuplex xmlns:cdp="http://schemas.microsoft.com/net/2006/06/duplex"/> +<ow:OneWay xmlns:ow="http://schemas.microsoft.com/ws/2005/05/routing/policy&quo... +<wsaw:UsingAddressing/> +</wsp:All> +</wsp:ExactlyOne> +</wsp:Policy> +<wsdl:import namespace="http://example.org/notify" location="wsdl0.wsdl"/> +<wsdl:import namespace="http://example.org/echo" location="wsdl2.wsdl"/> +<wsdl:types/> +<!-- <wsdl:binding name="CustomBinding_Notify" type="i0:Notify"> +<wsp:PolicyReference URI="#CustomBinding_Notify_policy"/> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Notify"> +<soap:operation soapAction="http://example.org/action/notify" style="document"/> +<wsdl:input name="NotifyMessage"> +<soap:body use="literal"/> +</wsdl:input> +</wsdl:operation> +</wsdl:binding> --> +<wsdl:binding name="CustomBinding_Notify1" type="i0:Notify"> +<!-- <wsp:PolicyReference URI="#CustomBinding_Notify1_policy"/> --> +<soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Notify"> +<soap12:operation soapAction="http://example.org/action/notify" style="document"/> +<wsdl:input name="NotifyMessage"> +<soap12:body use="literal"/> +</wsdl:input> +</wsdl:operation> +</wsdl:binding> +<!-- <wsdl:binding name="CustomBinding_Echo" type="i1:Echo"> +<wsp:PolicyReference URI="#CustomBinding_Echo_policy"/> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> --> +<wsdl:binding name="CustomBinding_Echo1" type="i1:Echo"> +<!-- <wsp:PolicyReference URI="#CustomBinding_Echo1_policy"/> --> +<soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap12:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap12:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap12:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> +<!-- <wsdl:binding name="CustomBinding_Echo2" type="i1:Echo"> +<wsp:PolicyReference URI="#CustomBinding_Echo2_policy"/> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> --> +<wsdl:binding name="CustomBinding_Echo3" type="i1:Echo"> +<!-- <wsp:PolicyReference URI="#CustomBinding_Echo3_policy"/> --> +<soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap12:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap12:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap12:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> +<!-- <wsdl:binding name="CustomBinding_Echo4" type="i1:Echo"> +<wsp:PolicyReference URI="#CustomBinding_Echo4_policy"/> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> --> +<wsdl:binding name="CustomBinding_Echo5" type="i1:Echo"> +<!-- <wsp:PolicyReference URI="#CustomBinding_Echo5_policy"/> --> +<soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/> +<wsdl:operation name="Echo"> +<soap12:operation soapAction="http://example.org/action/echoIn" style="document"/> +<wsdl:input name="EchoInMessage"> +<soap12:body use="literal"/> +</wsdl:input> +<wsdl:output name="EchoOutMessage"> +<soap12:body use="literal"/> +</wsdl:output> +</wsdl:operation> +</wsdl:binding> </wsdl:definitions> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl2.wsdl =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl2.wsdl 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/wsdl2.wsdl 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,23 +1,22 @@ -<wsdl:definitions targetNamespace='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/echo' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-ws... xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <wsdl:types> - <xsd:schema targetNamespace='http://example.org/echo/Imports'> - <xsd:import namespace='http://example.org/echo' schemaLocation='xsd2.xsd'/> - <xsd:import namespace='http://example.org/notify' schemaLocation='xsd0.xsd'/> - <xsd:import namespace='http://schemas.microsoft.com/2003/10/Serialization/' schemaLocation='xsd1.xsd'/> - </xsd:schema> - </wsdl:types> - <wsdl:message name='EchoInMessage'> - <wsdl:part element='tns:EchoInMessage' name='parameters'/> - </wsdl:message> - <wsdl:message name='EchoOutMessage'> - <wsdl:part element='tns:EchoOutMessage' name='parameters'/> - </wsdl:message> - <!--wsdl:portType name='EchoPortType'--> - <wsdl:portType name='Echo'> - <!--wsdl:operation name='EchoOp'--> - <wsdl:operation name='Echo'> - <wsdl:input message='tns:EchoInMessage' name='EchoInMessage' wsaw:Action='http://example.org/action/echoIn'/> - <wsdl:output message='tns:EchoOutMessage' name='EchoOutMessage' wsaw:Action='http://example.org/action/echoOut'/> - </wsdl:operation> - </wsdl:portType> +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions targetNamespace="http://example.org/echo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://example.org/echo" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy&... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"> +<wsdl:types> +<xsd:schema targetNamespace="http://example.org/echo/Imports"> +<xsd:import schemaLocation="xsd2.xsd" namespace="http://example.org/echo"/> +<xsd:import schemaLocation="xsd0.xsd" namespace="http://schemas.microsoft.com/2003/10/Serialization/"... +<xsd:import schemaLocation="xsd1.xsd" namespace="http://example.org/notify"/> +</xsd:schema> +</wsdl:types> +<wsdl:message name="EchoInMessage"> +<wsdl:part name="echoIn" element="tns:echoIn"/> +</wsdl:message> +<wsdl:message name="EchoOutMessage"> +<wsdl:part name="echoOut" element="tns:echoOut"/> +</wsdl:message> +<wsdl:portType name="Echo"> +<wsdl:operation name="Echo"> +<wsdl:input wsaw:Action="http://example.org/action/echoIn" name="EchoInMessage" message="tns:EchoInMessage"/> +<wsdl:output wsaw:Action="http://example.org/action/echoOut" name="EchoOutMessage" message="tns:EchoOutMessage"/> +</wsdl:operation> +</wsdl:portType> </wsdl:definitions> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd0.xsd =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd0.xsd 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd0.xsd 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,9 +1,40 @@ -<xs:schema elementFormDefault='qualified' targetNamespace='http://example.org/notify' xmlns:tns='http://example.org/notify' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='NotifyMessage'> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs='0' name='notify' nillable='true' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:element> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/... xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/"... +<xs:element name="anyType" nillable="true" type="xs:anyType"/> +<xs:element name="anyURI" nillable="true" type="xs:anyURI"/> +<xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/> +<xs:element name="boolean" nillable="true" type="xs:boolean"/> +<xs:element name="byte" nillable="true" type="xs:byte"/> +<xs:element name="dateTime" nillable="true" type="xs:dateTime"/> +<xs:element name="decimal" nillable="true" type="xs:decimal"/> +<xs:element name="double" nillable="true" type="xs:double"/> +<xs:element name="float" nillable="true" type="xs:float"/> +<xs:element name="int" nillable="true" type="xs:int"/> +<xs:element name="long" nillable="true" type="xs:long"/> +<xs:element name="QName" nillable="true" type="xs:QName"/> +<xs:element name="short" nillable="true" type="xs:short"/> +<xs:element name="string" nillable="true" type="xs:string"/> +<xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/> +<xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/> +<xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/> +<xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/> +<xs:element name="char" nillable="true" type="tns:char"/> +<xs:simpleType name="char"> +<xs:restriction base="xs:int"/> +</xs:simpleType> +<xs:element name="duration" nillable="true" type="tns:duration"/> +<xs:simpleType name="duration"> +<xs:restriction base="xs:duration"> +<xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?"/> +<xs:minInclusive value="-P10675199DT2H48M5.4775808S"/> +<xs:maxInclusive value="P10675199DT2H48M5.4775807S"/> +</xs:restriction> +</xs:simpleType> +<xs:element name="guid" nillable="true" type="tns:guid"/> +<xs:simpleType name="guid"> +<xs:restriction base="xs:string"> +<xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}"/> +</xs:restriction> +</xs:simpleType> +<xs:attribute name="FactoryType" type="xs:QName"/> </xs:schema> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd1.xsd =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd1.xsd 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd1.xsd 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,39 +1,2 @@ -<xs:schema attributeFormDefault='qualified' elementFormDefault='qualified' targetNamespace='http://schemas.microsoft.com/2003/10/Serialization/&... xmlns:tns='http://schemas.microsoft.com/2003/10/Serialization/' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='anyType' nillable='true' type='xs:anyType'/> - <xs:element name='anyURI' nillable='true' type='xs:anyURI'/> - <xs:element name='base64Binary' nillable='true' type='xs:base64Binary'/> - <xs:element name='boolean' nillable='true' type='xs:boolean'/> - <xs:element name='byte' nillable='true' type='xs:byte'/> - <xs:element name='dateTime' nillable='true' type='xs:dateTime'/> - <xs:element name='decimal' nillable='true' type='xs:decimal'/> - <xs:element name='double' nillable='true' type='xs:double'/> - <xs:element name='float' nillable='true' type='xs:float'/> - <xs:element name='int' nillable='true' type='xs:int'/> - <xs:element name='long' nillable='true' type='xs:long'/> - <xs:element name='QName' nillable='true' type='xs:QName'/> - <xs:element name='short' nillable='true' type='xs:short'/> - <xs:element name='string' nillable='true' type='xs:string'/> - <xs:element name='unsignedByte' nillable='true' type='xs:unsignedByte'/> - <xs:element name='unsignedInt' nillable='true' type='xs:unsignedInt'/> - <xs:element name='unsignedLong' nillable='true' type='xs:unsignedLong'/> - <xs:element name='unsignedShort' nillable='true' type='xs:unsignedShort'/> - <xs:element name='char' nillable='true' type='tns:char'/> - <xs:simpleType name='char'> - <xs:restriction base='xs:int'/> - </xs:simpleType> - <xs:element name='duration' nillable='true' type='tns:duration'/> - <xs:simpleType name='duration'> - <xs:restriction base='xs:duration'> - <xs:pattern value='\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?'/> - <xs:minInclusive value='-P10675199DT2H48M5.4775808S'/> - <xs:maxInclusive value='P10675199DT2H48M5.4775807S'/> - </xs:restriction> - </xs:simpleType> - <xs:element name='guid' nillable='true' type='tns:guid'/> - <xs:simpleType name='guid'> - <xs:restriction base='xs:string'> - <xs:pattern value='[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}'/> - </xs:restriction> - </xs:simpleType> - <xs:attribute name='FactoryType' type='xs:QName'/> -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/notify" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/notify"><xs:element name="notify" nillable="true" type="xs:string"/></xs:schema> \ No newline at end of file Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd2.xsd =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd2.xsd 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/xsd2.xsd 2007-11-06 23:42:02 UTC (rev 5000) @@ -1,16 +1,2 @@ -<xs:schema elementFormDefault='qualified' targetNamespace='http://example.org/echo' xmlns:tns='http://example.org/echo' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='EchoInMessage'> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs='0' name='echoIn' nillable='true' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name='EchoOutMessage'> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs='0' name='echoOut' nillable='true' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:element> -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/echo" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/echo"><xs:element name="echoIn" nillable="true" type="xs:string"/><xs:element name="echoOut" nillable="true" type="xs:string"/></xs:schema> \ No newline at end of file Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt/META-INF/scenarios.xml 2007-11-06 23:42:02 UTC (rev 5000) @@ -8,4 +8,7 @@ <scenario name="microsoft" description="Microsoft public endpoint"> <target-endpoint>http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncrypt</target-endpoint> </scenario> + <scenario name="microsoft-local" description="Microsoft public endpoint"> + <target-endpoint>http://10.10.34.2/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncrypt</target-endpoint> + </scenario> </client-scenarios> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/encrypt3DES/META-INF/scenarios.xml 2007-11-06 23:42:02 UTC (rev 5000) @@ -8,4 +8,7 @@ <scenario name="microsoft" description="Microsoft public endpoint"> <target-endpoint>http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncryptRsa15TripleDes</target-endpoint> </scenario> + <scenario name="microsoft-local" description="Microsoft public endpoint"> + <target-endpoint>http://10.10.34.2/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncryptRsa15TripleDes</target-endpoint> + </scenario> </client-scenarios> Modified: stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml =================================================================== --- stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml 2007-11-06 20:37:11 UTC (rev 4999) +++ stack/native/branches/asoldano/trunk/src/test/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF/scenarios.xml 2007-11-06 23:42:02 UTC (rev 5000) @@ -8,4 +8,7 @@ <scenario name="microsoft" description="Microsoft public endpoint"> <target-endpoint>https://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport</target-endpoint> </scenario> + <scenario name="microsoft-local" description="Microsoft public endpoint"> + <target-endpoint>https://10.10.34.2/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport</target-endpoint> + </scenario> </client-scenarios>