[jbossws-commits] JBossWS SVN: r4289 - in stack/native/branches/native-2.0: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-08-09 07:23:39 -0400 (Thu, 09 Aug 2007) New Revision: 4289 Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java Modified: stack/native/branches/native-2.0/ant-import-tests/build-jars-jaxws.xml Log: Fix JBWS-1694: SOAP header not being set as request param Modified: stack/native/branches/native-2.0/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/native-2.0/ant-import-tests/build-jars-jaxws.xml 2007-08-09 11:15:56 UTC (rev 4288) +++ stack/native/branches/native-2.0/ant-import-tests/build-jars-jaxws.xml 2007-08-09 11:23:39 UTC (rev 4289) @@ -333,6 +333,13 @@ </classes> </war> + <!-- jaxws-jbws1694 --> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1694.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1694/**/*.class"/> + </fileset> + </jar> + <!-- jaxws-jbws1702 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,43 @@ +/* + * 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.jbws1694; + +import java.util.List; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Basket +{ + String customerId; + + public String getCustomerId() + { + return customerId; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,30 @@ +/* + * 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class BasketEntries +{ +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,41 @@ +/* + * 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Header +{ + private String uuid; + + public String getUuid() + { + return this.uuid; + } + + public void setUuid(String uuid) + { + this.uuid = uuid; + } +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,61 @@ +/* + * 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.jbws1694; + +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.Holder; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1694.JBWS1694EndpointSEI") +@Stateless +@WebContext(contextRoot = "jbws1694") +public class JBWS1694Endpoint implements JBWS1694EndpointSEI +{ + @WebMethod(operationName = "SubmitBasket") + @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") + public Receipt submitBasket( + + @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, + mode = WebParam.Mode.INOUT) + Holder<Header> header, + + @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") + Basket request) + throws Exception + { + if(null==header) + throw new IllegalArgumentException("inout header was null"); + + Receipt receipt = new Receipt(); + receipt.setMsg(header.value.getUuid()); + return receipt; + } +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,50 @@ +/* + * 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.jbws1694; + +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.Holder; +import javax.ejb.Remote; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService +@Remote +public interface JBWS1694EndpointSEI +{ + @WebMethod(operationName = "SubmitBasket") + @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") + public Receipt submitBasket( + + @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, + mode = WebParam.Mode.INOUT) + Holder<Header> header, + + @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") + Basket request) + throws Exception; +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,65 @@ +/* + * 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.jbws1694; + +import junit.framework.Test; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.Holder; +import java.net.URL; + +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JBWS1694TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1694TestCase.class, "jaxws-jbws1694.jar"); + } + + public void testInheritanceRpc() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1694/JBWS1694Endpoint?wsdl"); + QName serviceName = new QName("http://jbws1694.jaxws.ws.test.jboss.org/";, "JBWS1694EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + + JBWS1694EndpointSEI port = service.getPort(JBWS1694EndpointSEI .class); + + Header inout = new Header(); + inout.setUuid("1234"); + + Basket basket = new Basket(); + basket.setCustomerId("4567"); + + Receipt receipt = port.submitBasket(new Holder(inout), basket); + assertTrue(receipt.getMsg().equals("1234")); + } + + + +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java (rev 0) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java 2007-08-09 11:23:39 UTC (rev 4289) @@ -0,0 +1,41 @@ +/* + * 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Receipt +{ + String msg; + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } +} Property changes on: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF