Author: thomas.diesler(a)jboss.com Date: 2007-04-02 08:13:46 -0400 (Mon, 02 Apr 2007) New Revision: 2746 Added: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl Removed: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderJAXBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderPayloadTestCase.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/provider-handlers.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/Provider.wsdl Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.java branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/usertype.xsd branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml Log: Add httpbinding testcase Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-04-02 12:13:46 UTC (rev 2746) @@ -80,6 +80,28 @@ </manifest> </jar> + <!-- jaxws-samples-httpbinding --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <!-- jaxws-samples-jsr181ejb --> <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> <fileset dir="${tests.output.dir}/classes"> Copied: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java (from rev 2745, branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderJAXBTestCase.java) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java (rev 0) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -0,0 +1,141 @@ +/* + * 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.jaxws.samples.httpbinding; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.w3c.dom.Element; + +/** + * Test a Provider<SOAPMessage> + * + * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @since 29-Jun-2006 + */ +public class HttpJAXBTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HttpJAXBTestCase.class, "jaxws-samples-httpbinding-jaxb.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/ProviderEndpoint?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testProviderDispatch() throws Exception + { + Dispatch<Object> dispatch = createDispatch("ProviderEndpoint"); + + UserType user = new UserType(); + user.setString("Kermit"); + user.setQname(new QName("TheFrog")); + UserType userRes = (UserType)dispatch.invoke(user); + assertEquals(user.getString(), userRes.getString()); + assertEquals(user.getQname(), userRes.getQname()); + } + + public void testWebServiceDispatch() throws Exception + { + Dispatch<Object> dispatch = createDispatch("WebServiceEndpoint"); + + UserType user = new UserType(); + user.setString("Kermit"); + user.setQname(new QName("TheFrog")); + UserType userRes = (UserType)dispatch.invoke(user); + assertEquals(user.getString(), userRes.getString()); + assertEquals(user.getQname(), userRes.getQname()); + } + + private Dispatch<Object> createDispatch(String target) throws MalformedURLException, JAXBException + { + String targetNS = "http://org.jboss.ws/httpbinding"; + QName serviceName = new QName(targetNS, "ProviderService"); + QName portName = new QName(targetNS, "ProviderPort"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/" + target + "?wsdl"); + + Service service = Service.create(serviceName); + service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); + + JAXBContext jbc = JAXBContext.newInstance(new Class[] { UserType.class }); + Dispatch<Object> dispatch = service.createDispatch(portName, jbc, Mode.PAYLOAD); + return dispatch; + } + + public void testProviderMessage() throws Exception + { + String reqString = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:user xmlns:ns1='http://org.jboss.ws/httpbinding'>" + + " <string>Kermit</string>" + + " <qname>The Frog</qname>" + + " </ns1:user>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqString.getBytes())); + + URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/ProviderEndpoint"); + SOAPMessage resMsg = con.call(reqMsg, epURL); + SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + + Element child = (Element)resEnv.getBody().getChildElements().next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); + UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); + + assertEquals("Kermit", user.getString()); + assertEquals(new QName("The Frog"), user.getQname()); + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java (from rev 2745, branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderPayloadTestCase.java) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java (rev 0) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -0,0 +1,126 @@ +/* + * 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.jaxws.samples.httpbinding; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.w3c.dom.Element; + +/** + * Test a Provider<SOAPMessage> + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Jun-2006 + */ +public class HttpPayloadTestCase extends JBossWSTest +{ + private String reqString = + "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/httpbinding'>Hello</ns1:somePayload>"; + + private String resString = + "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/httpbinding'>Hello:InboundLogicalHandler:OutboundLogicalHandler</ns1:somePayload>"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HttpPayloadTestCase.class, "jaxws-samples-httpbinding-payload.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-payload?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testProviderDispatch() throws Exception + { + Dispatch<Source> dispatch = createDispatch("ProviderEndpoint"); + Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse(reqString))); + + Element docElement = getElementFromSource(resPayload); + assertEquals(DOMUtils.parse(resString), docElement); + } + + public void testProviderMessage() throws Exception + { + String reqEnvStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Body>" + reqString + "</env:Body>" + + "</env:Envelope>"; + + String resEnvString = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + resString + "</env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes())); + + URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-payload"); + SOAPMessage resMsg = con.call(reqMsg, epURL); + SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + + assertEquals(DOMUtils.parse(resEnvString), resEnv); + } + + private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException + { + String targetNS = "http://org.jboss.ws/httpbinding"; + QName serviceName = new QName(targetNS, "ProviderService"); + QName portName = new QName(targetNS, "ProviderPort"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-payload/" + target + "?wsdl"); + + Service service = Service.create(serviceName); + service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); + + Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); + return dispatch; + } +} Modified: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -42,7 +42,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Jun-2006 */ -@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/httpbinding", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") +@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/httpbinding", wsdlLocation = "WEB-INF/wsdl/HttpBinding.wsdl") @ServiceMode(value = Service.Mode.PAYLOAD) public class ProviderBeanJAXB implements Provider<Source> { Modified: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -46,7 +46,7 @@ */ @HandlerChain(file = "httpbinding-handlers.xml") -@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/httpbinding", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") +@WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/httpbinding", wsdlLocation = "WEB-INF/wsdl/HttpBinding.wsdl") // @ServiceMode(value = Service.Mode.PAYLOAD) - PAYLOAD is implicit public class ProviderBeanPayload implements Provider<Source> { Deleted: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderJAXBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderJAXBTestCase.java 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderJAXBTestCase.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -1,141 +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.jaxws.samples.httpbinding; - -// $Id$ - -import java.io.ByteArrayInputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.soap.SOAPBinding; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.w3c.dom.Element; - -/** - * Test a Provider<SOAPMessage> - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @since 29-Jun-2006 - */ -public class ProviderJAXBTestCase extends JBossWSTest -{ - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ProviderJAXBTestCase.class, "jaxws-samples-httpbinding-jaxb.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/ProviderEndpoint?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testProviderDispatch() throws Exception - { - Dispatch<Object> dispatch = createDispatch("ProviderEndpoint"); - - UserType user = new UserType(); - user.setString("Kermit"); - user.setQname(new QName("TheFrog")); - UserType userRes = (UserType)dispatch.invoke(user); - assertEquals(user.getString(), userRes.getString()); - assertEquals(user.getQname(), userRes.getQname()); - } - - public void testWebServiceDispatch() throws Exception - { - Dispatch<Object> dispatch = createDispatch("WebServiceEndpoint"); - - UserType user = new UserType(); - user.setString("Kermit"); - user.setQname(new QName("TheFrog")); - UserType userRes = (UserType)dispatch.invoke(user); - assertEquals(user.getString(), userRes.getString()); - assertEquals(user.getQname(), userRes.getQname()); - } - - private Dispatch<Object> createDispatch(String target) throws MalformedURLException, JAXBException - { - String targetNS = "http://org.jboss.ws/httpbinding"; - QName serviceName = new QName(targetNS, "ProviderService"); - QName portName = new QName(targetNS, "ProviderPort"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/" + target + "?wsdl"); - - Service service = Service.create(serviceName); - service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); - - JAXBContext jbc = JAXBContext.newInstance(new Class[] { UserType.class }); - Dispatch<Object> dispatch = service.createDispatch(portName, jbc, Mode.PAYLOAD); - return dispatch; - } - - public void testProviderMessage() throws Exception - { - String reqString = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <ns1:user xmlns:ns1='http://org.jboss.ws/httpbinding'>" + - " <string>Kermit</string>" + - " <qname>The Frog</qname>" + - " </ns1:user>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqString.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/ProviderEndpoint"); - SOAPMessage resMsg = con.call(reqMsg, epURL); - SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - - Element child = (Element)resEnv.getBody().getChildElements().next(); - JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); - UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); - - assertEquals("Kermit", user.getString()); - assertEquals(new QName("The Frog"), user.getQname()); - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderPayloadTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderPayloadTestCase.java 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderPayloadTestCase.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -1,126 +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.jaxws.samples.httpbinding; - -// $Id$ - -import java.io.ByteArrayInputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.soap.SOAPBinding; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.w3c.dom.Element; - -/** - * Test a Provider<SOAPMessage> - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Jun-2006 - */ -public class ProviderPayloadTestCase extends JBossWSTest -{ - private String reqString = - "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello</ns1:somePayload>"; - - private String resString = - "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:InboundLogicalHandler:OutboundLogicalHandler</ns1:somePayload>"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ProviderPayloadTestCase.class, "jaxws-samples-provider-payload.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testProviderDispatch() throws Exception - { - Dispatch<Source> dispatch = createDispatch("ProviderEndpoint"); - Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse(reqString))); - - Element docElement = getElementFromSource(resPayload); - assertEquals(DOMUtils.parse(resString), docElement); - } - - public void testProviderMessage() throws Exception - { - String reqEnvStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Body>" + reqString + "</env:Body>" + - "</env:Envelope>"; - - String resEnvString = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + resString + "</env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload"); - SOAPMessage resMsg = con.call(reqMsg, epURL); - SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - - assertEquals(DOMUtils.parse(resEnvString), resEnv); - } - - private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException - { - String targetNS = "http://org.jboss.ws/provider"; - QName serviceName = new QName(targetNS, "ProviderService"); - QName portName = new QName(targetNS, "ProviderPort"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload/" + target + "?wsdl"); - - Service service = Service.create(serviceName); - service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm()); - - Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); - return dispatch; - } -} Modified: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.java 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.java 2007-04-02 12:13:46 UTC (rev 2746) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.jaxws.samples.httpbinding; import javax.jws.WebParam; @@ -27,16 +27,13 @@ import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.ParameterStyle; -@WebService( - serviceName = "ProviderService", - portName = "ProviderPort", - targetNamespace = "http://org.jboss.ws/httpbinding", - wsdlLocation = "WEB-INF/wsdl/Provider.wsdl") +@WebService(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/httpbinding", wsdlLocation = "WEB-INF/wsdl/HttpBinding.wsdl") @SOAPBinding(parameterStyle = ParameterStyle.BARE) public class WebServiceEndpoint { - @WebResult(name="user") - public UserType echo(@WebParam(name="user")UserType type) + @WebResult(name = "user") + public UserType echo(@WebParam(name = "user") + UserType type) { return type; } Copied: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml (from rev 2745, branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/provider-handlers.xml) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml (rev 0) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml 2007-04-02 12:13:46 UTC (rev 2746) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <handler> + <handler-name> LogicalHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.httpbinding.LogicalSourceHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Deleted: branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/provider-handlers.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/provider-handlers.xml 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/provider-handlers.xml 2007-04-02 12:13:46 UTC (rev 2746) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <handler> - <handler-name> LogicalHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.httpbinding.LogicalSourceHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml 2007-04-02 12:13:46 UTC (rev 2746) @@ -7,11 +7,11 @@ <servlet> <servlet-name>ProviderEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.provider.ProviderBeanJAXB</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.httpbinding.ProviderBeanJAXB</servlet-class> </servlet> <servlet> <servlet-name>WebServiceEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.provider.WebServiceEndpoint</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.httpbinding.WebServiceEndpoint</servlet-class> </servlet> <servlet-mapping> <servlet-name>ProviderEndpoint</servlet-name> Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/usertype.xsd =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/usertype.xsd 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/jaxb/usertype.xsd 2007-04-02 12:13:46 UTC (rev 2746) @@ -5,15 +5,15 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" - xmlns:ns1="http://org.jboss.ws/provider" - targetNamespace="http://org.jboss.ws/provider" + xmlns:ns1="http://org.jboss.ws/httpbinding" + targetNamespace="http://org.jboss.ws/httpbinding" elementFormDefault="qualified" jxb:version="1.0"> <xsd:annotation> <xsd:appinfo> <jxb:schemaBindings> - <jxb:package name="org.jboss.test.ws.jaxws.provider"/> + <jxb:package name="org.jboss.test.ws.jaxws.httpbinding"/> </jxb:schemaBindings> </xsd:appinfo> </xsd:annotation> Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml 2007-04-02 12:13:46 UTC (rev 2746) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.provider.ProviderBeanPayload</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.httpbinding.ProviderBeanPayload</servlet-class> </servlet> <servlet-mapping> <servlet-name>TestEndpoint</servlet-name> Added: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl (rev 0) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl 2007-04-02 12:13:46 UTC (rev 2746) @@ -0,0 +1,43 @@ +<?xml version='1.0'?> +<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/httpbinding' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/httpbinding' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/httpbinding' xmlns:tns='http://org.jboss.ws/httpbinding' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='user' type='tns:UserType'/> + <xs:complexType name='UserType'> + <xs:sequence> + <xs:element name='string' type='xs:string'/> + <xs:element name='qname' type='xs:QName'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='echo'> + <part element='tns:user' name='user'/> + </message> + <message name='echoResponse'> + <part element='tns:user' name='user'/> + </message> + <portType name='Provider'> + <operation name='echo'> + <input message='tns:echo'/> + <output message='tns:echoResponse'/> + </operation> + </portType> + <binding name='ProviderBinding' type='tns:Provider'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='ProviderService'> + <port binding='tns:ProviderBinding' name='ProviderPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Property changes on: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/Provider.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/Provider.wsdl 2007-04-02 11:54:12 UTC (rev 2745) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/httpbinding/shared/wsdl/Provider.wsdl 2007-04-02 12:13:46 UTC (rev 2746) @@ -1,43 +0,0 @@ -<?xml version='1.0'?> -<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='user' type='tns:UserType'/> - <xs:complexType name='UserType'> - <xs:sequence> - <xs:element name='string' type='xs:string'/> - <xs:element name='qname' type='xs:QName'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='echo'> - <part element='tns:user' name='user'/> - </message> - <message name='echoResponse'> - <part element='tns:user' name='user'/> - </message> - <portType name='Provider'> - <operation name='echo'> - <input message='tns:echo'/> - <output message='tns:echoResponse'/> - </operation> - </portType> - <binding name='ProviderBinding' type='tns:Provider'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='ProviderService'> - <port binding='tns:ProviderBinding' name='ProviderPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions>