Author: richard.opalka(a)jboss.com Date: 2008-01-08 09:43:47 -0500 (Tue, 08 Jan 2008) New Revision: 5418 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java stack/native/trunk/src/test/resources/jaxws/jbws1822/ stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/ stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/ stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/ stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt Log: [JBWS-1822] test provided Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-08 13:46:46 UTC (rev 5417) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-08 14:43:47 UTC (rev 5418) @@ -502,6 +502,40 @@ <include name="wsdl/my-service.wsdl"/> </metainf> </jar> + + <!-- jaxws-jbws1822 --> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> + </fileset> + </jar> + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> + <include name="jboss-app.xml"/><!-- this fixes the problem --> + </metainf> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> + </ear> + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> + </ear> <!-- jaxws-jbws1840 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar"> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java 2008-01-08 13:46:46 UTC (rev 5417) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Iface.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.jbws1762.services; +import javax.jws.WebService; + /** * EJB3 interface * @@ -28,8 +30,6 @@ * * @since Oct 17, 2007 */ -import javax.jws.WebService; - @WebService public interface EJB3Iface { Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,84 @@ +/* + * 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.jbws1822; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1822] Cannot find service endpoint target + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 8, 2008 + */ +public final class JBWS1822TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1822TestCase.class, ""); + } + + private EJB3RemoteIface getProxy() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS1822";, "TestService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + return (EJB3RemoteIface)service.getPort(EJB3RemoteIface.class); + } + + public void testOneEjbModule() throws Exception + { + deploy("jaxws-jbws1822-one-ejb-module.ear"); + try + { + assertEquals(getProxy().getMessage(), "Injected hello message"); + } + finally + { + undeploy("jaxws-jbws1822-one-ejb-module.ear"); + } + } + + public void testTwoEjbModules() throws Exception + { + deploy("jaxws-jbws1822-two-ejb-modules.ear"); + try + { + assertEquals(getProxy().getMessage(), "Injected hello message"); + } + finally + { + undeploy("jaxws-jbws1822-two-ejb-modules.ear"); + } + } + +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,42 @@ +/* + * 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.jbws1822.shared; + +import javax.ejb.Stateless; +import org.jboss.annotation.ejb.LocalBinding; + +/** + * The EJB3 implementation + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +@Stateless +@LocalBinding(jndiBinding = "TestBeanIface") +public class TestBean implements TestBeanIface +{ + public String printString() + { + return "Injected hello message"; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,34 @@ +/* + * 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.jbws1822.shared; + +/** + * The EJB3 interface + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +public interface TestBeanIface +{ + String printString(); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,55 @@ +/* + * 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.jbws1822.webservice; + +import javax.ejb.EJB; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.test.ws.jaxws.jbws1822.shared.TestBeanIface; + +/** + * EJB3 bean published as WebService injecting other EJB3 bean + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +@WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "TestService") +@WebContext(contextRoot="/jaxws-jbws1822", urlPattern="/*") +@SOAPBinding(style = SOAPBinding.Style.RPC) +(a)Remote(EJB3RemoteIface.class) +@Stateless +public class EJB3Bean implements EJB3RemoteIface +{ + @EJB + private TestBeanIface testBean; + + @WebMethod + public String getMessage() + { + return testBean.printString(); + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,37 @@ +/* + * 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.jbws1822.webservice; + +import javax.jws.WebService; + +/** + * An EJB3 remote interface + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +@WebService +public interface EJB3RemoteIface +{ + String getMessage(); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.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/application_1_4.xsd"> + + <display-name>test</display-name> + + <module> + <ejb>jaxws-jbws1822-two-ejb3-inside.jar</ejb> + </module> + +</application> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application + version="1.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/application_1_4.xsd"> + + <display-name>test</display-name> + + <module> + <java>jaxws-jbws1822-shared.jar</java> + </module> + + <module> + <ejb>jaxws-jbws1822-one-ejb3-inside.jar</ejb> + </module> + +</application> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml 2008-01-08 14:43:47 UTC (rev 5418) @@ -0,0 +1,9 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-app + PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> + +<jboss-app> + <module-order>strict</module-order> +</jboss-app> Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules/META-INF/jboss-app.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-08 13:46:46 UTC (rev 5417) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-08 14:43:47 UTC (rev 5418) @@ -24,6 +24,7 @@ org/jboss/test/ws/jaxws/jbws1809/** org/jboss/test/ws/jaxws/jbws1813/** org/jboss/test/ws/jaxws/jbws1815/** +org/jboss/test/ws/jaxws/jbws1822/** org/jboss/test/ws/jaxws/jbws1840/** org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/namespace/**