Author: asoldano Date: 2015-03-04 05:59:32 -0500 (Wed, 04 Mar 2015) New Revision: 19511 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/CDIHandler.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/JBWS3845TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/MyBean.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceInterface.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/jaxws-endpoint-config.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/beans.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/web.xml Log: [JBWS-3845] Adding testcase Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/CDIHandler.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/CDIHandler.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/CDIHandler.java 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,63 @@ +/* + * 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.jbws3845; + +import javax.inject.Inject; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.ws.api.handler.GenericSOAPHandler; + +public class CDIHandler extends GenericSOAPHandler<SOAPMessageContext> +{ + + @Inject + MyBean bean; + + @Override + public boolean handleInbound(SOAPMessageContext msgContext) + { + if (bean == null) { + throw new RuntimeException("Injection doesn't work"); + } + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + + String oldValue = soapElement.getValue(); + String newValue = "Mr. " + oldValue; + soapElement.setValue(newValue); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/CDIHandler.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/jbws3845/JBWS3845TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/JBWS3845TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/JBWS3845TestCase.java 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,82 @@ +/* + * 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.jbws3845; + +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.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.spec.WebArchive; +import org.jboss.wsf.test.IgnoreContainer; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * [JBWS-3845] Injection not working in JAX-WS handlers from predefined configurations + * + * @author alessio.soldano(a)jboss.com + * @since 03-Mar-2015 + */ +(a)RunWith(Arquillian.class) +public class JBWS3845TestCase extends JBossWSTest +{ + @Rule + public IgnoreContainer rule = new IgnoreContainer("wildfly800"); + + @ArquillianResource + private URL baseURL; + + @Deployment(testable = false) + public static WebArchive createDeployments() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws3845.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3845.MyBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws3845.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3845.ServiceInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3845.CDIHandler.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3845/WEB-INF/beans.xml"), "beans.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws3845/jaxws-endpoint-config.xml", "jaxws-endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3845/WEB-INF/web.xml")); + return archive; + } + + @Test + @RunAsClient + public void testService() throws Exception + { + Service service = Service.create(new URL(baseURL + "/service?wsdl"), new QName("http://org.jboss.ws/jaxws/jbws3845/", "MyService")); + ServiceInterface port = service.getPort(ServiceInterface.class); + assertEquals("Greetings Mr. John", port.greetMe("John")); + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/JBWS3845TestCase.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/jbws3845/MyBean.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/MyBean.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/MyBean.java 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,37 @@ +/* + * 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.jbws3845; + +public class MyBean +{ + private String value; + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/MyBean.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/jbws3845/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceImpl.java 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,40 @@ +/* + * 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.jbws3845; + +import javax.jws.WebService; + +@WebService +( + serviceName = "MyService", + endpointInterface = "org.jboss.test.ws.jaxws.jbws3845.ServiceInterface", + targetNamespace = "http://org.jboss.ws/jaxws/jbws3845/" +) +public class ServiceImpl implements ServiceInterface +{ + + public String greetMe(String input) + { + return "Greetings " + input; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceImpl.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/jbws3845/ServiceInterface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceInterface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceInterface.java 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,31 @@ +/* + * 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.jbws3845; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/jbws3845/") +public interface ServiceInterface +{ + + String greetMe(String input); +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/ServiceInterface.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/jbws3845/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3845/jaxws-endpoint-config.xml 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,18 @@ +<?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.jbws3845.ServiceImpl</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.jbws3845.CDIHandler</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/jbws3845/jaxws-endpoint-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/beans.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/jbws3845/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/web.xml 2015-03-04 10:59:32 UTC (rev 19511) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app 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" + version="2.4"> + + <servlet> + <servlet-name>Service</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3845.ServiceImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Service</servlet-name> + <url-pattern>/service</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3845/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native