Author: thomas.diesler(a)jboss.com Date: 2007-03-19 08:05:46 -0400 (Mon, 19 Mar 2007) New Revision: 2638 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java trunk/jbossws-tests/src/resources/jaxws/jbws1581/ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/web.xml Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml Log: Add test for jbws-1581 Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-18 08:37:19 UTC (rev 2637) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-19 12:05:46 UTC (rev 2638) @@ -236,6 +236,24 @@ </classes> </war> + <!-- jaxws-jbws1581 --> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxws metadata --> <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2007-03-19 12:05:46 UTC (rev 2638) @@ -0,0 +1,51 @@ +/* + * 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.jbws1581; + +import java.net.URL; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.xml.ws.WebServiceRef; + +import org.jboss.annotation.ejb.RemoteBinding; + +@Stateless +(a)Remote(EJB3Remote.class) +@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean") +public class EJB3Bean implements EJB3Remote +{ + @WebServiceRef(wsdlLocation = "META-INF/wsdl/TestService.wsdl") + public EndpointInterface port; + + public String runTest(String message) + { + URL seiSource = EndpointInterface.class.getProtectionDomain().getCodeSource().getLocation(); + URL ejb3Source = EJB3Bean.class.getProtectionDomain().getCodeSource().getLocation(); + + if (seiSource.equals(ejb3Source) == false) + message = "SEI incorrectly loaded from: " + seiSource; + + return port.hello(message); + } + +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java 2007-03-19 12:05:46 UTC (rev 2638) @@ -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.jbws1581; + + +public interface EJB3Remote +{ + + public String runTest(final String message); + +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java 2007-03-19 12:05:46 UTC (rev 2638) @@ -0,0 +1,38 @@ +/* + * 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.jbws1581; + +import javax.jws.WebService; + +import org.jboss.logging.Logger; + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "TestService") +public class EndpointBean +{ + private static final Logger log = Logger.getLogger(EndpointBean.class); + + public String hello(final String message) + { + log.info("hello: " + message); + return message; + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java 2007-03-19 12:05:46 UTC (rev 2638) @@ -0,0 +1,25 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws1581; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) + +/** + * The SEI that is packaged with the war endpoint may potentially + * contain different annotations that the one packaged with the EJB client + */ +public interface EndpointInterface +{ + String hello(String msg); +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2007-03-19 12:05:46 UTC (rev 2638) @@ -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.jbws1581; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * EJB vehicle using loader repository not sufficiently isolated + * + * http://jira.jboss.org/jira/browse/JBWS-1581 + * + * @author Thomas.Diesler(a)jboss.com + * @since 19-Mar-2007 + */ +public class JBWS1581TestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1581TestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); + } + + public void testCall() throws Exception + { + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); + String retStr = remote.runTest("Hello World!"); + assertEquals("Hello World!", retStr); + } +} \ No newline at end of file Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2007-03-19 12:05:46 UTC (rev 2638) @@ -0,0 +1,33 @@ +<definitions name='TestService' targetNamespace='http://jbws1581.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1581.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> + <message name='EndpointInterface_hello'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='EndpointInterface_helloResponse'> + <part name='return' type='xsd:string'/> + </message> + <portType name='EndpointInterface'> + <operation name='hello' parameterOrder='arg0'> + <input message='tns:EndpointInterface_hello'/> + <output message='tns:EndpointInterface_helloResponse'/> + </operation> + </portType> + <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='hello'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://jbws1581.jaxws.ws.test.jboss.org/' use='literal'/> + </input> + <output> + <soap:body namespace='http://jbws1581.jaxws.ws.test.jboss.org/' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:EndpointInterfaceBinding' name='EndpointBeanPort'> + <soap:address location='http://@jbosstest.host.name@:8080/jaxws-jbws1581'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/web.xml 2007-03-19 12:05:46 UTC (rev 2638) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>EndpointBean</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1581.EndpointBean</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>EndpointBean</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Property changes on: trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF