Author: richard.opalka(a)jboss.com Date: 2011-01-28 07:21:00 -0500 (Fri, 28 Jan 2011) New Revision: 13635 Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml Log: [JBPAPP-5052] providing test cases for ThreadLocal aware WebServiceContext Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-01-28 12:18:02 UTC (rev 13634) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-01-28 12:21:00 UTC (rev 13635) @@ -755,6 +755,23 @@ </fileset> </jar> + <!-- jaxws-jbws2934 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2934.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2934/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" /> + </classes> + </war> + + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2934.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" /> + </fileset> + </jar> + <!-- jaxws-jbws2955 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2955.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; + +/** + * Abstract endpoint implementation reused in both JSE and EJB endpoint. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +abstract class AbstractEndpoint implements Endpoint +{ + + protected AbstractEndpoint() + { + super(); + } + + @Resource + WebServiceContext wsCtx1; + WebServiceContext wsCtx2; + + @Resource + void setWebServiceContext(WebServiceContext wsCtx) + { + this.wsCtx2 = wsCtx; + } + + @PostConstruct + private void init() + { + this.assertWebServiceContexts(); + } + + protected int getQueryParameterInternal(String key) + { + this.assertWebServiceContexts(); + int ctx1Value = this.getValue(this.wsCtx1, key); + int ctx2Value = this.getValue(this.wsCtx2, key); + if (ctx1Value != ctx2Value) + throw new WebServiceException("Values have to be equivalent, they're comming from the same request"); + + return ++ctx1Value; + } + + protected int getValue(WebServiceContext wsCtx, String queryKey) + { + HttpServletRequest servletReq = (HttpServletRequest)wsCtx.getMessageContext().get(MessageContext.SERVLET_REQUEST); + String queryString = servletReq.getQueryString(); + int equalsSignPosition = queryString.indexOf('='); + return Integer.valueOf(queryString.substring(equalsSignPosition + 1)); + } + + protected void assertWebServiceContexts() + { + if (this.wsCtx1 == null) + throw new WebServiceException("Web service context 1 is null"); + if (this.wsCtx2 == null) + throw new WebServiceException("Web service context 2 is null"); + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import org.jboss.logging.Logger; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +abstract class AbstractTestCase extends JBossWSTest +{ + private static final int THREADS_COUNT = 20; + private static final int REQUESTS_COUNT = 20; + private static String endpointAddress; + private final Endpoint[] proxies = new Endpoint[THREADS_COUNT]; + private final Thread[] threads = new Thread[THREADS_COUNT]; + private final TestJob[] jobs = new TestJob[THREADS_COUNT]; + private final Logger log = Logger.getLogger(this.getClass()); + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName("http://jboss.org/jbws2934";, "EndpointService"); + endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2934"; + URL wsdlURL = new URL(endpointAddress + "?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + for (int i = 0; i < THREADS_COUNT; i++) + proxies[i] = service.getPort(Endpoint.class); + } + + public void testEndpointConcurrently() throws Exception + { + for (int i = 0; i < THREADS_COUNT; i++) + { + log.debug("Creating thread " + (i + 1)); + jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i); + threads[i] = new Thread(jobs[i]); + } + for (int i = 0; i < THREADS_COUNT; i++) + { + log.debug("Starting thread " + (i + 1)); + threads[i].start(); + } + Exception e = null; + for (int i = 0; i < THREADS_COUNT; i++) + { + log.debug("Joining thread " + (i + 1)); + threads[i].join(); + if (e == null) + e = jobs[i].getException(); + } + if (e != null) throw e; + } + + private static final class TestJob implements Runnable + { + private final String jobName; + private final Endpoint proxy; + private final int countOfRequests; + private Exception exception; + private static final Logger log = Logger.getLogger(TestJob.class); + + TestJob(Endpoint proxy, int countOfRequests, String jobName) + { + this.proxy = proxy; + this.countOfRequests = countOfRequests; + this.jobName = jobName; + } + + public void run() + { + try + { + for (int i = 0; i < this.countOfRequests; i++) + { + this.setQueryParameter(proxy, i); + int retVal = proxy.getQueryParameter(jobName); + log.debug("Thread=" + this.jobName + ", iteration=" + i); + if (retVal != (i + 1)) + throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal); + } + } + catch (Exception e) + { + log.error("Exception caught: " + e.getMessage()); + this.exception = e; + } + } + + private void setQueryParameter(Endpoint proxy, int value) + { + BindingProvider bp = (BindingProvider)proxy; + String queryString = "?" + this.jobName + "=" + value; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress + queryString); + } + + Exception getException() + { + return this.exception; + } + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Endpoint interface. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2934") +public interface Endpoint +{ + @WebMethod + public int getQueryParameter(String key); +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; +import javax.xml.ws.WebServiceException; + +import javax.ejb.Stateless; +import org.jboss.wsf.spi.annotation.AuthMethod; +import org.jboss.wsf.spi.annotation.TransportGuarantee; +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * Endpoint EJB implementation. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@Stateless +@WebService +( + name = "Endpoint", + serviceName = "EndpointService", + targetNamespace="http://jboss.org/jbws2934";, + endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint" +) +@WebContext +( + contextRoot = "/jaxws-jbws2934", + urlPattern = "/*" +) +public class EndpointEJB extends AbstractEndpoint +{ + @WebMethod + public int getQueryParameter(String key) + { + return super.getQueryParameterInternal(key); + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Endpoint JSE implementation. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService +( + name = "Endpoint", + serviceName = "EndpointService", + targetNamespace="http://jboss.org/jbws2934";, + endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint" +) +public class EndpointJSE extends AbstractEndpoint +{ + @WebMethod + public int getQueryParameter(String key) + { + return super.getQueryParameterInternal(key); + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - EJB version. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBWS2934EJBTestCase extends AbstractTestCase +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS2934EJBTestCase.class, "jaxws-jbws2934.jar"); + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2934; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - JSE version. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBWS2934JSETestCase extends AbstractTestCase +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS2934JSETestCase.class, "jaxws-jbws2934.war"); + } +} Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml (rev 0) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml 2011-01-28 12:21:00 UTC (rev 13635) @@ -0,0 +1,17 @@ +<?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>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2934.EndpointJSE</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +