[jbossws-commits] JBossWS SVN: r19510 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: java/org/jboss/test/ws/jaxws/jbws2074/usecase5 and 14 other directories.

Author: asoldano Date: 2015-03-03 11:54:22 -0500 (Tue, 03 Mar 2015) New Revision: 19510 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Iface.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Impl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/endpoint-config.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/client/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOIface.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/endpoint-config.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/application.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/application.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/web.xml Log: [JBWS-3846] Additional tests... Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/JBWS2074TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/JBWS2074TestCase.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,143 @@ +/* + * 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.jbws2074.usecase5.client; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.arquillian.container.test.api.Deployer; +import org.jboss.arquillian.container.test.api.Deployment; +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.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.test.ws.jaxws.jbws2074.usecase5.service.EJB3Iface; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * [JBWS-2074] Resource injection in jaxws endpoints and handlers + * [JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations + * + * @author ropalka(a)redhat.com + * @author alessio.soldano(a)jboss.com + * + * @since 03-Mar-2015 + */ +(a)RunWith(Arquillian.class) +public final class JBWS2074TestCase extends JBossWSTest +{ + private static final String JAR_DEPLOYMENT = "jaxws-jbws2074-usecase5"; + private static final String EAR_DEPLOYMENT = "jaxws-jbws2074-ear-usecase5"; + + @ArquillianResource + Deployer deployer; + + private static JavaArchive getJarArchive() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, JAR_DEPLOYMENT + ".jar"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase5.service.EJB3Iface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase5.service.EJB3Impl.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase5/service/endpoint-config.xml", "endpoint-config.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml"), "ejb-jar.xml"); + return archive; + } + + @Deployment(name = JAR_DEPLOYMENT, testable = false, managed = false, order = 1) + public static JavaArchive createClientDeployment1() { + return getJarArchive(); + } + + @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false, order = 2) + public static EnterpriseArchive createClientDeployment() { + EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase5.ear"); + archive + .addManifest() + .addAsModule(getJarArchive()) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase5-ear/META-INF/application.xml"), "application.xml"); + return archive; + } + + public void executeTest() throws Exception + { + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase5/Service"; + QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "EJB3Service"); + Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + EJB3Iface port = (EJB3Iface)service.getPort(EJB3Iface.class); + + String retStr = port.echo("hello"); + + StringBuffer expStr = new StringBuffer("hello"); + expStr.append(":Inbound:ManualResourcesHandler"); + expStr.append(":Inbound:JavaResourcesHandler"); + expStr.append(":Inbound:DescriptorResourcesHandler"); + expStr.append(":EJB3Impl"); + expStr.append(":Outbound:DescriptorResourcesHandler"); + expStr.append(":Outbound:JavaResourcesHandler"); + expStr.append(":Outbound:ManualResourcesHandler"); + assertEquals(expStr.toString(), retStr); + } + + @Test + @RunAsClient + public void testUsecase5WithoutEar() throws Exception + { + try + { + deployer.deploy(JAR_DEPLOYMENT); + executeTest(); + } + finally + { + deployer.undeploy(JAR_DEPLOYMENT); + } + } + + @Test + @RunAsClient + public void testUsecase5WithEar() throws Exception + { + try + { + deployer.deploy(EAR_DEPLOYMENT); + executeTest(); + } + finally + { + deployer.undeploy(EAR_DEPLOYMENT); + } + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/client/JBWS2074TestCase.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/jbws2074/usecase5/service/EJB3Iface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Iface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Iface.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,36 @@ +/* + * 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.jbws2074.usecase5.service; + +import javax.ejb.Remote; +import javax.jws.WebService; + +@Remote +@WebService +( + name = "EJB3", + targetNamespace = "http://ws.jboss.org/jbws2074" +) +public interface EJB3Iface +{ + String echo(String s); +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Iface.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/jbws2074/usecase5/service/EJB3Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Impl.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,56 @@ +/* + * 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.jbws2074.usecase5.service; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.annotation.EndpointConfig; +import org.jboss.ws.api.annotation.WebContext; + +@Stateless +@WebService +( + name = "EJB3", + serviceName = "EJB3Service", + targetNamespace = "http://ws.jboss.org/jbws2074", + endpointInterface = "org.jboss.test.ws.jaxws.jbws2074.usecase5.service.EJB3Iface" +) +@EndpointConfig(configFile = "endpoint-config.xml", configName = "MyConf") +@WebContext +( + urlPattern="/Service", + contextRoot="/jaxws-jbws2074-usecase5" +) +public class EJB3Impl implements EJB3Iface +{ + + private static Logger log = Logger.getLogger(EJB3Impl.class); + + public String echo(String msg) + { + log.info("echo: " + msg); + return msg + ":EJB3Impl"; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/EJB3Impl.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/jbws2074/usecase5/service/endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase5/service/endpoint-config.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,26 @@ +<?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>MyConf</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>DescriptorResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>JavaResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>ManualResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler</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/jbws2074/usecase5/service/endpoint-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml 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/jbws2074/usecase6/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/client/JBWS2074TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/client/JBWS2074TestCase.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,142 @@ +/* + * 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.jbws2074.usecase6.client; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.arquillian.container.test.api.Deployer; +import org.jboss.arquillian.container.test.api.Deployment; +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.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.test.ws.jaxws.jbws2074.usecase6.service.POJOIface; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * [JBWS-2074] Resource injection in jaxws endpoints and handlers + * [JBWS-3846] Refactor creation process of jaxws handlers from predefined configurations + * + * @author ropalka(a)redhat.com + * @author alessio.soldano(a)jboss.com + * + * @since 03-Mar-2015 + */ +(a)RunWith(Arquillian.class) +public final class JBWS2074TestCase extends JBossWSTest +{ + private static final String WAR_DEPLOYMENT = "jaxws-jbws2074-usecase6"; + + @ArquillianResource + Deployer deployer; + + private static WebArchive getWarArchive() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase6.service.POJOIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase6.service.POJOImpl.class) + .addAsWebInfResource("org/jboss/test/ws/jaxws/jbws2074/usecase6/service/endpoint-config.xml", "endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase6/WEB-INF/web.xml")); + return archive; + } + + @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false, order = 1) + public static WebArchive createClientDeployment1() { + return getWarArchive(); + } + + @Deployment(name = "jaxws-jbws2074-ear-usecase6", testable = false, managed = false, order = 2) + public static EnterpriseArchive createClientDeployment() { + EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2074-usecase6.ear"); + archive + .addManifest() + .addAsModule(getWarArchive()) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase6-ear/META-INF/application.xml"), "application.xml"); + return archive; + } + + public void executeTest() throws Exception + { + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase6/Service"; + QName serviceName = new QName("http://ws.jboss.org/jbws2074";, "POJOService"); + Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + POJOIface port = (POJOIface)service.getPort(POJOIface.class); + + String retStr = port.echo("hello"); + + StringBuffer expStr = new StringBuffer("hello"); + expStr.append(":Inbound:ManualResourcesHandler"); + expStr.append(":Inbound:JavaResourcesHandler"); + expStr.append(":Inbound:DescriptorResourcesHandler"); + expStr.append(":POJOImpl"); + expStr.append(":Outbound:DescriptorResourcesHandler"); + expStr.append(":Outbound:JavaResourcesHandler"); + expStr.append(":Outbound:ManualResourcesHandler"); + assertEquals(expStr.toString(), retStr); + } + + @Test + @RunAsClient + public void testusecase6WithoutEar() throws Exception + { + try + { + deployer.deploy(WAR_DEPLOYMENT); + executeTest(); + } + finally + { + deployer.undeploy(WAR_DEPLOYMENT); + } + } + + @Test + @RunAsClient + public void testusecase6WithEar() throws Exception + { + try + { + deployer.deploy("jaxws-jbws2074-ear-usecase6"); + executeTest(); + } + finally + { + deployer.undeploy("jaxws-jbws2074-ear-usecase6"); + } + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/client/JBWS2074TestCase.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/jbws2074/usecase6/service/POJOIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOIface.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,34 @@ +/* + * 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.jbws2074.usecase6.service; + +import javax.jws.WebService; + +@WebService +( + name = "POJO", + targetNamespace = "http://ws.jboss.org/jbws2074" +) +public interface POJOIface +{ + String echo(String s); +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOIface.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/jbws2074/usecase6/service/POJOImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOImpl.java 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,48 @@ +/* + * 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.jbws2074.usecase6.service; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.annotation.EndpointConfig; + +@WebService +( + name = "POJO", + serviceName = "POJOService", + targetNamespace = "http://ws.jboss.org/jbws2074", + endpointInterface = "org.jboss.test.ws.jaxws.jbws2074.usecase6.service.POJOIface" +) +@EndpointConfig(configFile = "WEB-INF/endpoint-config.xml", configName = "MyConf") +public class POJOImpl implements POJOIface +{ + private static Logger log = Logger.getLogger(POJOImpl.class); + + @WebMethod + public String echo(String msg) + { + log.info("echo: " + msg); + return msg + ":POJOImpl"; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/POJOImpl.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/jbws2074/usecase6/service/endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase6/service/endpoint-config.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,26 @@ +<?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>MyConf</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>DescriptorResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>JavaResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>ManualResourcesHandler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler</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/jbws2074/usecase6/service/endpoint-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"> + + <enterprise-beans> + <session> + + <ejb-name>EJB3Impl</ejb-name> + + <env-entry> + <env-entry-name>boolean</env-entry-name> + <env-entry-type>java.lang.Boolean</env-entry-type> + <env-entry-value>true</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>boolean0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>boolean1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>byte</env-entry-name> + <env-entry-type>java.lang.Byte</env-entry-type> + <env-entry-value>1</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>byte0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>byte1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>character</env-entry-name> + <env-entry-type>java.lang.Character</env-entry-type> + <env-entry-value>c</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>character0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>character1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>short</env-entry-name> + <env-entry-type>java.lang.Short</env-entry-type> + <env-entry-value>5</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>short0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>short1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>integer</env-entry-name> + <env-entry-type>java.lang.Integer</env-entry-type> + <env-entry-value>7</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>integer0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>integer1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>long</env-entry-name> + <env-entry-type>java.lang.Long</env-entry-type> + <env-entry-value>11</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>long0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>long1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>float</env-entry-name> + <env-entry-type>java.lang.Float</env-entry-type> + <env-entry-value>13</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>float0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>float1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>double</env-entry-name> + <env-entry-type>java.lang.Double</env-entry-type> + <env-entry-value>17</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>double0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>double1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>string</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>s</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>string0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>string1</injection-target-name> + </injection-target> + </env-entry> + + </session> + + </enterprise-beans> + +</ejb-jar> Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5/META-INF/ejb-jar.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/application.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/application.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/application.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,11 @@ +<?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>jbws2074 issue</display-name> + <module> + <java>jaxws-jbws2074-usecase5.jar</java> + </module> +</application> Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase5-ear/META-INF/application.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/web.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + <servlet> + <servlet-name>Service</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2074.usecase6.service.POJOImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Service</servlet-name> + <url-pattern>/Service</url-pattern> + </servlet-mapping> + + <env-entry> + <env-entry-name>boolean</env-entry-name> + <env-entry-type>java.lang.Boolean</env-entry-type> + <env-entry-value>true</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>boolean0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>boolean1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>byte</env-entry-name> + <env-entry-type>java.lang.Byte</env-entry-type> + <env-entry-value>1</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>byte0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>byte1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>character</env-entry-name> + <env-entry-type>java.lang.Character</env-entry-type> + <env-entry-value>c</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>character0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>character1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>short</env-entry-name> + <env-entry-type>java.lang.Short</env-entry-type> + <env-entry-value>5</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>short0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>short1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>integer</env-entry-name> + <env-entry-type>java.lang.Integer</env-entry-type> + <env-entry-value>7</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>integer0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>integer1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>long</env-entry-name> + <env-entry-type>java.lang.Long</env-entry-type> + <env-entry-value>11</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>long0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>long1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>float</env-entry-name> + <env-entry-type>java.lang.Float</env-entry-type> + <env-entry-value>13</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>float0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>float1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>double</env-entry-name> + <env-entry-type>java.lang.Double</env-entry-type> + <env-entry-value>17</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>double0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>double1</injection-target-name> + </injection-target> + </env-entry> + + <env-entry> + <env-entry-name>string</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>s</env-entry-value> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>string0</injection-target-name> + </injection-target> + <injection-target> + <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> + <injection-target-name>string1</injection-target-name> + </injection-target> + </env-entry> + +</web-app> Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/application.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/application.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/application.xml 2015-03-03 16:54:22 UTC (rev 19510) @@ -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>jbws2074 issue</display-name> + <module> + <web> + <web-uri>jaxws-jbws2074-usecase6.war</web-uri> + <context-root>/jaxws-jbws2074-usecase6</context-root> + </web> + </module> +</application> Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2074/usecase6-ear/META-INF/application.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native