[jbossws-commits] JBossWS SVN: r6299 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c.

Author: thomas.diesler(a)jboss.com Date: 2008-04-09 06:23:36 -0400 (Wed, 09 Apr 2008) New Revision: 6299 Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java Removed: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java Log: Add javadoc Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java (from rev 6270, framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java 2008-04-09 10:23:36 UTC (rev 6299) @@ -0,0 +1,87 @@ +/* + * 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.jbws1566.c; + +import java.net.URL; +import java.rmi.RemoteException; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; +import org.jboss.test.ws.jaxws.jbws1566.b.BClass; +import org.jboss.test.ws.jaxws.jbws1566.b.BException; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1566] Invalid wsdl using @XmlSchema annotations on Types + * + * http://jira.jboss.org/jira/browse/JBWS-1566 + * + */ +public class JBWS1566TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1566TestCase.class, "jaxws-jbws1566.jar"); + } + + public void testWebService() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + System.out.println("wsdl URL:" + wsdlURL); + + QName serviceName = new QName("http://org.jboss.ws/samples/c", "WebServiceTestService"); + Service service = Service.create(wsdlURL, serviceName); + Jaxb20TestWSInterface port = service.getPort(Jaxb20TestWSInterface.class); + + BindingProvider bindingProvider = (BindingProvider)port; + Map<String, Object> reqContext = bindingProvider.getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); + + TestEnumeration res = null; + BClass input = new BClass(); + input.setA(1); + input.setB("hello service"); + try + { + res = port.testMethod(input); + assertEquals(res, TestEnumeration.A); + } + catch (BException e) + { + fail("Caught unexpeced TestException: " + e); + } + catch (RemoteException e) + { + fail("Caught unexpeced RemoteException: " + e); + } + assertNotNull(res); + } +} Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2008-04-09 10:02:25 UTC (rev 6298) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20StatelessTestBean.java 2008-04-09 10:23:36 UTC (rev 6299) @@ -1,3 +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. + */ package org.jboss.test.ws.jaxws.jbws1566.c; import java.rmi.RemoteException; @@ -2,35 +23,28 @@ +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; import org.jboss.test.ws.jaxws.jbws1566.b.BClass; import org.jboss.test.ws.jaxws.jbws1566.b.BException; - -import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; import org.jboss.wsf.spi.annotation.WebContext; -import javax.ejb.Stateless; -import javax.jws.WebService; - @Stateless -@WebService( - endpointInterface = "org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface", - targetNamespace = "http://org.jboss.ws/samples/c", - serviceName = "WebServiceTestService", - portName = "WebServiceTestPort" -) -@WebContext( - contextRoot = "/jaxwstest" - , urlPattern="/Jaxb20StatelessTestBean/*" - , secureWSDLAccess=false -) -public class Jaxb20StatelessTestBean implements Jaxb20TestWSInterface { +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface", targetNamespace = "http://org.jboss.ws/samples/c", serviceName = "WebServiceTestService", portName = "WebServiceTestPort") +@WebContext(contextRoot = "/jaxwstest", urlPattern = "/Jaxb20StatelessTestBean/*", secureWSDLAccess = false) +public class Jaxb20StatelessTestBean implements Jaxb20TestWSInterface +{ - public TestEnumeration testMethod(BClass input) throws BException, RemoteException { - System.out.println("Got input: "+input +": a="+input.getA()+", b="+input.getB()); - if (input.getA()==0) { - BException ex = new BException(); - ex.setAe(11); - ex.setBe(13); - throw ex; - } - return TestEnumeration.A; - } + public TestEnumeration testMethod(BClass input) throws BException, RemoteException + { + System.out.println("Got input: " + input + ": a=" + input.getA() + ", b=" + input.getB()); + if (input.getA() == 0) + { + BException ex = new BException(); + ex.setAe(11); + ex.setBe(13); + throw ex; + } + return TestEnumeration.A; + } } Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2008-04-09 10:02:25 UTC (rev 6298) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2008-04-09 10:23:36 UTC (rev 6299) @@ -1,55 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1566.c; - -import java.net.URL; -import java.rmi.RemoteException; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import org.jboss.test.ws.jaxws.jbws1566.a.*; -import org.jboss.test.ws.jaxws.jbws1566.b.*; - -public class Jaxb20TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean"; - - public static Test suite() - { - return new JBossWSTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar"); - } - - public void testWebService() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); - System.out.println("wsdl URL:"+wsdlURL); - - QName serviceName = new QName("http://org.jboss.ws/samples/c", "WebServiceTestService"); - Service service = Service.create(wsdlURL, serviceName); - Jaxb20TestWSInterface port = service.getPort(Jaxb20TestWSInterface.class); - - BindingProvider bindingProvider = (BindingProvider)port; - Map<String, Object> reqContext = bindingProvider.getRequestContext(); - reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); - - TestEnumeration res=null; - BClass input = new BClass(); - input.setA(1); - input.setB("hello service"); - try { - res = port.testMethod(input); - assertEquals(res, TestEnumeration.A); - } catch (BException e) { - fail("Caught unexpeced TestException: "+e); - } catch (RemoteException e) { - fail("Caught unexpeced RemoteException: "+e); - } - assertNotNull(res); - } -} Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2008-04-09 10:02:25 UTC (rev 6298) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2008-04-09 10:23:36 UTC (rev 6299) @@ -1,3 +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. + */ package org.jboss.test.ws.jaxws.jbws1566.c; import java.rmi.RemoteException; @@ -2,22 +23,16 @@ +import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; import org.jboss.test.ws.jaxws.jbws1566.b.BClass; import org.jboss.test.ws.jaxws.jbws1566.b.BException; -import org.jboss.test.ws.jaxws.jbws1566.a.TestEnumeration; +(a)javax.jws.WebService(targetNamespace = "http://org.jboss.ws/samples/c") +(a)javax.jws.soap.SOAPBinding(style = javax.jws.soap.SOAPBinding.Style.DOCUMENT, use = javax.jws.soap.SOAPBinding.Use.LITERAL, parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) +public interface Jaxb20TestWSInterface extends java.rmi.Remote +{ -(a)javax.jws.WebService( - targetNamespace = "http://org.jboss.ws/samples/c" -) -(a)javax.jws.soap.SOAPBinding( - style = javax.jws.soap.SOAPBinding.Style.DOCUMENT, - use = javax.jws.soap.SOAPBinding.Use.LITERAL, - parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) -public interface Jaxb20TestWSInterface extends java.rmi.Remote { + @javax.jws.WebMethod(operationName = "TestMethod") + public @javax.jws.WebResult(name = "result") + TestEnumeration testMethod((a)javax.jws.WebParam(name = "input", mode = javax.jws.WebParam.Mode.IN) + BClass input) throws BException, RemoteException; - @javax.jws.WebMethod(operationName = "TestMethod") - public @javax.jws.WebResult(name="result") TestEnumeration testMethod( - @javax.jws.WebParam(name="input", mode=javax.jws.WebParam.Mode.IN) - BClass input - ) throws BException, RemoteException; - } \ No newline at end of file