Author: asoldano Date: 2015-02-25 09:31:34 -0500 (Wed, 25 Feb 2015) New Revision: 19503 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean2.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean3.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean2.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean3.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java Log: [JBWS-3648] Adding (excluded) testcase Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2015-02-25 11:02:11 UTC (rev 19502) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -44,7 +44,6 @@ import org.jboss.wsf.spi.metadata.config.SOAPAddressRewriteMetadata; import org.jboss.wsf.stack.cxf.Loggers; import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper; -import org.jboss.wsf.stack.cxf.client.configuration.CXFClientConfigurer; import org.jboss.wsf.stack.cxf.client.configuration.InterceptorUtils; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-02-25 11:02:11 UTC (rev 19502) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -31,22 +31,23 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; /** * [JBWS-2634] Implement support for @EJB annotations in WS components + * [JBWS-3845] Injection in JAX-WS handler from pre-defined configurations * * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a> + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ @RunWith(Arquillian.class) public final class JBWS2634TestCase extends JBossWSTest @@ -61,7 +62,10 @@ .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.logging\n")) .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean2.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean3.class) .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml", "jaxws-endpoint-config.xml") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/WEB-INF/web.xml")); JBossWSTestHelper.writeToFile(archive1); @@ -80,7 +84,10 @@ .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.logging\n")) .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean2.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean3.class) .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml", "jaxws-endpoint-config.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/ejb-jar.xml"), "ejb-jar.xml"); JBossWSTestHelper.writeToFile(archive3); @@ -108,6 +115,32 @@ @Test @RunAsClient + @Ignore(value = "[JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations") + public void testPojoEndpoint2Injection() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS2634";, "POJOService2"); + URL wsdlURL = new URL(baseURL + "/POJOService2?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); + assertEquals("Hello World!:Inbound:TestHandler:POJOBean2:Outbound:TestHandler", proxy.echo("Hello World!")); + } + + @Test + @RunAsClient + @Ignore(value = "[JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations") + public void testPojoEndpoint3Injection() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS2634";, "POJOService3"); + URL wsdlURL = new URL(baseURL + "/POJOService3?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); + assertEquals("Hello World!:Inbound:TestHandler:POJOBean3:Outbound:TestHandler", proxy.echo("Hello World!")); + } + + @Test + @RunAsClient public void testEjb3EndpointInjection() throws Exception { QName serviceName = new QName("http://jbossws.org/JBWS2634";, "EJB3Service"); @@ -117,4 +150,30 @@ EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); assertEquals("Hello World!:Inbound:TestHandler:EJB3Bean:Outbound:TestHandler", proxy.echo("Hello World!")); } + + @Test + @RunAsClient + @Ignore(value = "[JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations") + public void testEjb3Endpoint2Injection() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS2634";, "EJB3Service2"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2634-ejb3/EJB3Service2?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); + assertEquals("Hello World!:Inbound:TestHandler:EJB3Bean2:Outbound:TestHandler", proxy.echo("Hello World!")); + } + + @Test + @RunAsClient + @Ignore(value = "[JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations") + public void testEjb3Endpoint3Injection() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS2634";, "EJB3Service3"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2634-ejb3/EJB3Service3?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); + assertEquals("Hello World!:Inbound:TestHandler:EJB3Bean3:Outbound:TestHandler", proxy.echo("Hello World!")); + } } Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean2.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean2.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean2.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2634.webservice; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.ws.api.annotation.WebContext; + +/** + * EJB3 bean published as WebService injecting other EJB3 bean. + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +@WebService +( + name="EJB3", + serviceName = "EJB3Service2", + targetNamespace = "http://jbossws.org/JBWS2634", + endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface" +) +@Stateless +@WebContext +( + urlPattern = "/EJB3Service2", + contextRoot = "/jaxws-jbws2634-ejb3" +) +public class EJB3Bean2 extends AbstractEndpointImpl +{ + + public String echo(String msg) + { + return super.echo(msg) + ":EJB3Bean2"; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean2.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean3.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean3.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean3.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2634.webservice; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.ws.api.annotation.EndpointConfig; +import org.jboss.ws.api.annotation.WebContext; + +/** + * EJB3 bean published as WebService injecting other EJB3 bean. + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +@WebService +( + name="EJB3", + serviceName = "EJB3Service3", + targetNamespace = "http://jbossws.org/JBWS2634", + endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface" +) +@Stateless +@WebContext +( + urlPattern = "/EJB3Service3", + contextRoot = "/jaxws-jbws2634-ejb3" +) +@EndpointConfig(configName = "EJB3Bean3Config") +public class EJB3Bean3 extends AbstractEndpointImpl +{ + + public String echo(String msg) + { + return super.echo(msg) + ":EJB3Bean3"; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean3.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean2.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean2.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean2.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2634.webservice; + +import javax.jws.WebService; + +/** + * POJO bean published as WebService injecting other EJB3 bean. + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +@WebService +( + name="POJO", + serviceName = "POJOService2", + targetNamespace = "http://jbossws.org/JBWS2634", + endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface" +) +public class POJOBean2 extends AbstractEndpointImpl +{ + + public String echo(String msg) + { + return super.echo(msg) + ":POJOBean2"; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean2.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean3.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean3.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean3.java 2015-02-25 14:31:34 UTC (rev 19503) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2634.webservice; + +import javax.jws.WebService; + +import org.jboss.ws.api.annotation.EndpointConfig; + +/** + * POJO bean published as WebService injecting other EJB3 bean. + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +@WebService +( + name="POJO", + serviceName = "POJOService3", + targetNamespace = "http://jbossws.org/JBWS2634", + endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface" +) +@EndpointConfig(configName = "POJOBean3Config") +public class POJOBean3 extends AbstractEndpointImpl +{ + + public String echo(String msg) + { + return super.echo(msg) + ":POJOBean3"; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean3.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml 2015-02-25 14:31:34 UTC (rev 19503) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean2</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Test Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>POJOBean3Config</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Test Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean2</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Test Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>EJB3Bean3Config</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Test Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-endpoint-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native