Author: asoldano Date: 2013-10-04 11:30:44 -0400 (Fri, 04 Oct 2013) New Revision: 17979 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloRequest.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: [JBWS-3713] Adding comprehensive test case Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-10-04 15:28:34 UTC (rev 17978) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-10-04 15:30:44 UTC (rev 17979) @@ -455,6 +455,35 @@ <include name="org/jboss/test/ws/jaxws/cxf/jbws3679/*.class"/> </classes> </war> + + <!-- jaxws-cxf-jbws3713 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> + </classes> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3713/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> + </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713-client.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet*.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> + <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Helper*.class" /> + </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required for ClientProxy --> + </manifest> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713-client.jar" manifest="${tests.output.dir}/test-resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> + <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Helper*.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.class" /> + </fileset> + </jar> <!-- jaxws-cxf-logging --> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.cxf.Bus; + +public class BusCounter +{ + private final Set<String> set = new HashSet<String>(); + + public void count(final Bus bus) + { + synchronized (set) + { + set.add(bus.getId()); + } + } + + public int getCount() { + synchronized (set) + { + return set.size(); + } + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.util.LinkedList; +import java.util.List; +import java.util.StringTokenizer; + +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.stack.cxf.client.ProviderImpl; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; + +public class ClientBusStrategyTests extends JBossWSTest //*Tests does not match the configured surefire filter on test classes' names +{ + public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713/HelloService"; + private final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + + /** + * Verifies jaxws client bus selection strategy controlled by system properties; in order for checking that, + * starting a new process is required, as the system property is read once and cached in JBossWS. + * + * @param strategy + * @param wsdlAddress + * @param threadPoolSize + * @param invocations + * @return + * @throws Exception + */ + protected List<Integer> runJBossModulesClient(final String strategy, + final String wsdlAddress, + final int threadPoolSize, + final int invocations) throws Exception { + File javaFile = new File (System.getProperty("java.home") + FS + "bin" + FS + "java"); + String javaCmd = javaFile.exists() ? javaFile.getCanonicalPath() : "java"; + + final String jbh = System.getProperty("jboss.home"); + final String jbm = jbh + FS + "modules"; + final String jbmjar = jbh + FS + "jboss-modules.jar"; + + final File f = new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3713-client.jar"); + + //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar + String props = " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + + " -D" + Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY + "=" + strategy + " -jar " + jbmjar + " -mp " + jbm; + final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + wsdlAddress + " " + threadPoolSize + " " + invocations; + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + executeCommand(command, bout); + String res = null; + if (bout.toByteArray() != null) { + String output = new String(bout.toByteArray()); + BufferedReader reader = new BufferedReader(new java.io.StringReader(output)); + res = reader.readLine(); + } + StringTokenizer st = new StringTokenizer(res, " "); + List<Integer> list = new LinkedList<Integer>(); + while (st.hasMoreTokens()) { + list.add(Integer.parseInt(st.nextToken())); + } + return list; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URL; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet(name = "ClientServlet", urlPatterns = "/client/*") +public class ClientServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String strategy = req.getParameter("strategy"); + if (strategy == null || strategy.length() == 0) + throw new ServletException("strategy not specified!"); + String host = req.getParameter("host"); + if (host == null || host.length() == 0) + throw new ServletException("host not specified!"); + String threads = req.getParameter("threads"); + if (threads == null || threads.length() == 0) + throw new ServletException("threads not specified!"); + String calls = req.getParameter("calls"); + if (calls == null || calls.length() == 0) + throw new ServletException("calls not specified!"); + + PrintWriter w = res.getWriter(); + final URL wsdlURL = new URL("http://" + host + ":8080/jaxws-cxf-jbws3713/HelloService?wsdl"); + Helper helper = new Helper(); + w.write(helper.run(wsdlURL, strategy, Integer.parseInt(threads), Integer.parseInt(calls)).toString()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URL; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet(name = "ClientServletUsingThreadLocal", urlPatterns = "/client-using-threadlocal/*") +public class ClientServletUsignThreadLocal extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String strategy = req.getParameter("strategy"); + if (strategy == null || strategy.length() == 0) + throw new ServletException("strategy not specified!"); + String host = req.getParameter("host"); + if (host == null || host.length() == 0) + throw new ServletException("host not specified!"); + String threads = req.getParameter("threads"); + if (threads == null || threads.length() == 0) + throw new ServletException("threads not specified!"); + String calls = req.getParameter("calls"); + if (calls == null || calls.length() == 0) + throw new ServletException("calls not specified!"); + + PrintWriter w = res.getWriter(); + final URL wsdlURL = new URL("http://" + host + ":8080/jaxws-cxf-jbws3713/HelloService?wsdl"); + HelperUsignThreadLocal helper = new HelperUsignThreadLocal(); + w.write(helper.run(wsdlURL, strategy, Integer.parseInt(threads), Integer.parseInt(calls)).toString()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServletUsignThreadLocal.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloRequest.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloRequest.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloRequest.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +public class HelloRequest +{ + private String input; + + public String getInput() + { + return input; + } + + public void setInput(String input) + { + this.input = input; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloRequest.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloResponse.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.util.ArrayList; +import java.util.List; + +public class HelloResponse +{ + private List<String> multiHello = new ArrayList<String>(); + + public List<String> getMultiHello() + { + return multiHello; + } + + public void setMultiHello(List<String> multiHello) + { + this.multiHello = multiHello; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloResponse.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import javax.jws.WebService; + +@WebService(wsdlLocation = "WEB-INF/wsdl/Hello.wsdl", + name = HelloWs.NAME, + serviceName = HelloWs.NAME, + targetNamespace = HelloWs.TARGET_NAMESPACE, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs") +public class HelloWSImpl implements HelloWs +{ + + public HelloResponse doHello(HelloRequest request) + { + HelloResponse response = new HelloResponse(); + response.getMultiHello().add(request.getInput()); + response.getMultiHello().add("world"); + return response; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWs.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; +import javax.jws.WebService; + +@WebService(name = HelloWs.NAME, targetNamespace = HelloWs.TARGET_NAMESPACE) +public interface HelloWs +{ + public final static String NAME = "HelloService"; + + public final static String TARGET_NAMESPACE = "http://hello/test"; + + public HelloResponse doHello(HelloRequest request); +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWs.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,150 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceFeature; + +import org.apache.cxf.frontend.ClientProxy; +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.stack.cxf.client.UseNewBusFeature; +import org.jboss.wsf.stack.cxf.client.UseTCCLBusFeature; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; + +/** + * A helper class creating a pool of JAXWS clients that invoke the test endpoint. + * Here each client execution create a new JAXWS services. + * Returns the number of Bus instances created to run the clients. + * + * @author alessio.soldano(a)jboss.com + * @since 04-Oct-2013 + * + */ +public class Helper +{ + public Integer run(final URL wsdlURL, final int size, final int calls) { + return run(wsdlURL, null, size, calls); + } + + public Integer run(final URL wsdlURL, final String strategyName, final int size, final int calls) { + final WebServiceFeature feature; + final String strategy; + if (strategyName != null) { + feature = convertToFeature(strategyName); + strategy = strategyName; + } else { + feature = null; + strategy = System.getProperty(Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY, null); + } + final BusCounter busCounter = new BusCounter(); + final ThreadFactory threadFactory = new ThreadFactory() + { + private volatile int i = 0; + + @Override + public Thread newThread(Runnable r) + { + return new Thread(r, "JBWS3373-thread-" + i++ + "-" + strategy); + } + }; + ExecutorService es = Executors.newFixedThreadPool(size, threadFactory); + List<Client> clients = new ArrayList<Helper.Client>(); + for (int i = 0; i < calls; i++) { + clients.add(new Client(wsdlURL, feature, busCounter)); + } + int count = 0; + try + { + List<Future<Boolean>> futures = es.invokeAll(clients); + for (Future<Boolean> f : futures) + { + if (f.get()) { + count++; + } + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } + finally + { + es.shutdown(); + } + if (count != calls) { + throw new RuntimeException((calls - count) + " client invocation(s) failed!"); + } + return busCounter.getCount(); + } + + private static WebServiceFeature convertToFeature(final String strategy) { + if (strategy.equals(Constants.NEW_BUS_STRATEGY)) { + return new UseNewBusFeature(); + } else if (strategy.equals(Constants.THREAD_BUS_STRATEGY)) { + return new UseThreadBusFeature(); + } else if (strategy.equals(Constants.TCCL_BUS_STRATEGY)) { + return new UseTCCLBusFeature(); + } else { + throw new RuntimeException("Unexpected strategy: " + strategy); + } + } + + private static class Client implements Callable<Boolean> + { + private final URL wsdlURL; + private final WebServiceFeature feature; + private final BusCounter busCounter; + + public Client(final URL wsdlURL, final WebServiceFeature feature, final BusCounter busCounter) + { + this.wsdlURL = wsdlURL; + this.feature = feature; + this.busCounter = busCounter; + } + + @Override + public Boolean call() throws Exception + { + QName qname = new QName("http://hello/test", "HelloService"); + Service service = feature != null ? Service.create(wsdlURL, qname, feature) : Service.create(wsdlURL, qname); + HelloWs helloPort = service.getPort(HelloWs.class); + org.apache.cxf.endpoint.Client cxfClient = ClientProxy.getClient(helloPort); + busCounter.count(cxfClient.getBus()); + + HelloRequest request = new HelloRequest(); + request.setInput("hi"); + HelloResponse response = helloPort.doHello(request); + return response.getMultiHello().contains("hi"); + } + + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/Helper.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,158 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceFeature; + +import org.apache.cxf.frontend.ClientProxy; +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.stack.cxf.client.UseNewBusFeature; +import org.jboss.wsf.stack.cxf.client.UseTCCLBusFeature; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; + +/** + * A helper class creating a pool of JAXWS clients that invoke the test endpoint. + * Here the JAXWS services for the clients are created in a ThreadLocal. + * Returns the number of Bus instances created to run the clients. + * + * @author alessio.soldano(a)jboss.com + * @since 04-Oct-2013 + * + */ +public class HelperUsignThreadLocal +{ + public Integer run(final URL wsdlURL, final int size, final int calls) { + return run(wsdlURL, null, size, calls); + } + + public Integer run(final URL wsdlURL, final String strategyName, final int size, final int calls) { + final WebServiceFeature feature; + final String strategy; + if (strategyName != null) { + feature = convertToFeature(strategyName); + strategy = strategyName; + } else { + feature = null; + strategy = System.getProperty(Constants.JBWS_CXF_JAXWS_CLIENT_BUS_STRATEGY, null); + } + final BusCounter busCounter = new BusCounter(); + final ThreadLocal<HelloWs> port = createPortThreadLocal(wsdlURL, feature, busCounter); + final ThreadFactory threadFactory = new ThreadFactory() + { + private volatile int i = 0; + + @Override + public Thread newThread(Runnable r) + { + return new Thread(r, "JBWS3373-TL-thread-" + i++ + "-" + strategy); + } + }; + ExecutorService es = Executors.newFixedThreadPool(size, threadFactory); + List<Client> clients = new ArrayList<HelperUsignThreadLocal.Client>(); + for (int i = 0; i < calls; i++) { + clients.add(new Client(port)); + } + int count = 0; + try + { + List<Future<Boolean>> futures = es.invokeAll(clients); + for (Future<Boolean> f : futures) + { + if (f.get()) { + count++; + } + } + } + catch (Exception e) + { + throw new RuntimeException(e); + } + finally + { + es.shutdown(); + } + if (count != calls) { + throw new RuntimeException((calls - count) + " client invocation(s) failed!"); + } + return busCounter.getCount(); + } + + private static WebServiceFeature convertToFeature(final String strategy) { + if (strategy.equals(Constants.NEW_BUS_STRATEGY)) { + return new UseNewBusFeature(); + } else if (strategy.equals(Constants.THREAD_BUS_STRATEGY)) { + return new UseThreadBusFeature(); + } else if (strategy.equals(Constants.TCCL_BUS_STRATEGY)) { + return new UseTCCLBusFeature(); + } else { + throw new RuntimeException("Unexpected strategy: " + strategy); + } + } + + private static ThreadLocal<HelloWs> createPortThreadLocal(final URL wsdlURL, final WebServiceFeature feature, final BusCounter busCounter) + { + return new ThreadLocal<HelloWs>() + { + @Override + protected HelloWs initialValue() + { + QName qname = new QName("http://hello/test", "HelloService"); + Service service = feature != null ? Service.create(wsdlURL, qname, feature) : Service.create(wsdlURL, qname); + HelloWs helloPort = service.getPort(HelloWs.class); + org.apache.cxf.endpoint.Client cxfClient = ClientProxy.getClient(helloPort); + busCounter.count(cxfClient.getBus()); + return helloPort; + } + }; + } + + private static class Client implements Callable<Boolean> + { + private final ThreadLocal<HelloWs> port; + + public Client(final ThreadLocal<HelloWs> port) + { + this.port = port; + } + + @Override + public Boolean call() throws Exception + { + HelloRequest request = new HelloRequest(); + request.setInput("hi"); + HelloResponse response = port.get().doHello(request); + return response.getMultiHello().contains("hi"); + } + + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/HelperUsignThreadLocal.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class InContainerClientBusStrategyTestCase extends JBossWSTest +{ + public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713/HelloService"; + + public static Test suite() + { + return new JBossWSTestSetup(InContainerClientBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war,jaxws-cxf-jbws3713-client.war"); + } + + public void testEndpoint() throws Exception + { + HelloWs port = getPort(endpointAddress); + HelloRequest request = new HelloRequest(); + request.setInput("hello"); + HelloResponse response = port.doHello(request); + assertEquals(2, response.getMultiHello().size()); + assertTrue(response.getMultiHello().contains("hello")); + assertTrue(response.getMultiHello().contains("world")); + } + + public void testClientWithNewBusStrategy() throws Exception + { + final int threadPoolSize = 10; + final int invocations = 50; + int busCount = callServlet("client-using-threadlocal", Constants.NEW_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(threadPoolSize, busCount); + + busCount = callServlet("client", Constants.NEW_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(invocations, busCount); + } + + public void testClientWithThreadBusStrategy() throws Exception + { + final int threadPoolSize = 10; + final int invocations = 50; + int busCount = callServlet("client-using-threadlocal", Constants.THREAD_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(threadPoolSize, busCount); + + busCount = callServlet("client", Constants.THREAD_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(threadPoolSize, busCount); + } + + public void testClientWithTCCLBusStrategy() throws Exception + { + final int threadPoolSize = 10; + final int invocations = 50; + int busCount = callServlet("client-using-threadlocal", Constants.TCCL_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(1, busCount); + + busCount = callServlet("client", Constants.TCCL_BUS_STRATEGY, threadPoolSize, invocations); + assertEquals(1, busCount); + } + + private static int callServlet(String pattern, String strategy, int threads, int calls) throws Exception { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3713-client/" + pattern + "?strategy=" + + strategy + "&host=" + getServerHost() + "&threads=" + threads + "&calls=" + calls); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + return Integer.parseInt(retStr); + } + + private HelloWs getPort(String publishURL) throws Exception + { + URL wsdlURL = new URL(publishURL + "?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + return service.getPort(HelloWs.class); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.net.URL; + +public class TestClient +{ + public static void main(String[] args) throws Exception + { + final String wsdlAddress = args[0]; + final String threadPoolSize = args[1]; + final String invocations = args[2]; + int ret1 = new HelperUsignThreadLocal().run(new URL(wsdlAddress), Integer.parseInt(threadPoolSize), Integer.parseInt(invocations)); + int ret2 = new Helper().run(new URL(wsdlAddress), Integer.parseInt(threadPoolSize), Integer.parseInt(invocations)); + System.out.println(String.valueOf(ret1) + " " + String.valueOf(ret2)); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.util.List; + +import junit.framework.Test; + +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class UseNewBusStrategyTestCase extends ClientBusStrategyTests +{ + public static Test suite() + { + return new JBossWSTestSetup(UseNewBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + } + + public void testClientWithNewBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.NEW_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); + assertEquals(threadPoolSize, list.get(0).intValue()); + assertEquals(invocations, list.get(1).intValue()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.util.List; + +import junit.framework.Test; + +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class UseTCCLBusStrategyTestCase extends ClientBusStrategyTests +{ + public static Test suite() + { + return new JBossWSTestSetup(UseTCCLBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + } + + public void testClientWithTCCLBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.TCCL_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); + assertEquals(1, list.get(0).intValue()); + assertEquals(1, list.get(1).intValue()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.jbws3713; + +import java.util.List; + +import junit.framework.Test; + +import org.jboss.wsf.stack.cxf.client.Constants; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class UseThreadBusStrategyTestCase extends ClientBusStrategyTests +{ + public static Test suite() + { + return new JBossWSTestSetup(UseThreadBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + } + + public void testClientWithThreadBusStrategy() throws Exception + { + final int threadPoolSize = 4; + final int invocations = 5; + List<Integer> list = runJBossModulesClient(Constants.THREAD_BUS_STRATEGY, endpointAddress + "?wsdl", threadPoolSize, invocations); + assertEquals(threadPoolSize, list.get(0).intValue()); + assertEquals(threadPoolSize, list.get(1).intValue()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient +Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl,org.jboss.ws.jaxws-client \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" targetNamespace="http://hello/test" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://hello/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <wsdl:types> +<schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test" schemaLocation="Hello_schema1.xsd"/> + <import namespace="http://hello/test2" schemaLocation="Hello_schema2.xsd"/> + <import namespace="http://hello/test3" schemaLocation="Hello_schema3.xsd"/> + <import namespace="http://hello/test4" schemaLocation="Hello_schema4.xsd"/> + <import namespace="http://hello/test5" schemaLocation="Hello_schema5.xsd"/> +</schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns:doHelloResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:9090/HelloServicePort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test" version="1.0"> +<xs:element name="doHello" type="tns:doHello"/> +<xs:element name="doHelloResponse" type="tns:doHelloResponse"/> +<xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test2" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test2" version="1.0"> +<xs:element name="doHello" type="tns:doHello"/> +<xs:element name="doHelloResponse" type="tns:doHelloResponse"/> +<xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test3" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test3" version="1.0"> +<xs:element name="doHello" type="tns:doHello"/> +<xs:element name="doHelloResponse" type="tns:doHelloResponse"/> +<xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test4" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test4" version="1.0"> +<xs:element name="doHello" type="tns:doHello"/> +<xs:element name="doHelloResponse" type="tns:doHelloResponse"/> +<xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd 2013-10-04 15:30:44 UTC (rev 17979) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test5" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test5" version="1.0"> +<xs:element name="doHello" type="tns:doHello"/> +<xs:element name="doHelloResponse" type="tns:doHelloResponse"/> +<xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native