Author: alessio.soldano(a)jboss.com Date: 2009-12-18 04:04:15 -0500 (Fri, 18 Dec 2009) New Revision: 11322 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java Log: svn merge -r 11309:11310 from 3.2.2 branch Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-12-17 13:21:00 UTC (rev 11321) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-12-18 09:04:15 UTC (rev 11322) @@ -36,6 +36,14 @@ </fileset> </jar> + <!-- jaxws-benchmark-basicdoclit --> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basicdoclit.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.class"/> + </fileset> + </jar> + <!-- jaxws-benchmark-complex --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-complex.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-12-17 13:21:00 UTC (rev 11321) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -209,7 +209,8 @@ ExecutorService es = Executors.newFixedThreadPool(threadCount); long startProcTime = new Date().getTime(); List<Future<Result>> futures = es.invokeAll(callables); - procTime = procTime + (new Date().getTime() - startProcTime); + long currentRunProcTime = new Date().getTime() - startProcTime; + procTime = procTime + currentRunProcTime; try { @@ -220,10 +221,12 @@ //ignore } + long currentRunIterations = 0; for (Future<Result> f : futures) { Result result = f.get(); long subtotal = result.getTotal(); + currentRunIterations = currentRunIterations + subtotal; total = total + subtotal; failed = failed + result.getFailures(); if (verbose) @@ -233,6 +236,12 @@ } } System.out.println(); + System.out.println("----------- RUN STATS -------------"); + System.out.println("Iterations: " + currentRunIterations); + System.out.println("Total processing time: " + currentRunProcTime + " ms"); + System.out.println("Iterations/sec: " + 1000 * currentRunIterations / currentRunProcTime); + System.out.println("------------------------------------"); + System.out.println(); } System.out.println("------------------------------------"); System.out.println("Iterations: " + total); Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit) Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java =================================================================== --- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-16 18:40:07 UTC (rev 11310) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.benchmark.test.basicdoclit; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; -import org.jboss.test.ws.jaxws.benchmark.Runner; - -/** - * - * @author alessio.soldano(a)jboss.com - * @since 16-Dec-2009 - * - */ -public class BasicDocLitTest implements BenchmarkTest -{ - private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basicdoclit/EndpointImpl"; - private String targetNS = "http://basicdoclit.test.benchmark.jaxws.ws.test.jboss.org/"; - - public Object prepare() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "EndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - return service.getPort(Endpoint.class); - } - - public void performIteration(Object port) throws Exception - { - Double val = Math.random(); - String par = "Hello" + val; - String ret = ((Endpoint)port).echo(par, val); - if (!(par.equals(ret))) - { - throw new Exception("Unexpected result: " + ret); - } - } - -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.benchmark.test.basicdoclit; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; +import org.jboss.test.ws.jaxws.benchmark.Runner; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 16-Dec-2009 + * + */ +public class BasicDocLitTest implements BenchmarkTest +{ + private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basicdoclit/EndpointImpl"; + private String targetNS = "http://basicdoclit.test.benchmark.jaxws.ws.test.jboss.org/"; + + public Object prepare() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + QName serviceName = new QName(targetNS, "EndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + return service.getPort(Endpoint.class); + } + + public void performIteration(Object port) throws Exception + { + Double val = Math.random(); + String par = "Hello" + val; + String ret = ((Endpoint)port).echo(par, val); + if (!(par.equals(ret))) + { + throw new Exception("Unexpected result: " + ret); + } + } + +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java =================================================================== --- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-16 18:40:07 UTC (rev 11310) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.benchmark.test.basicdoclit; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService (name="Endpoint") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -public interface Endpoint -{ - @WebMethod - String echo(String input1, Double input2); -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.benchmark.test.basicdoclit; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService (name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +public interface Endpoint +{ + @WebMethod + String echo(String input1, Double input2); +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java =================================================================== --- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-16 18:40:07 UTC (rev 11310) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.benchmark.test.basicdoclit; - -import javax.jws.WebService; - -import org.jboss.logging.Logger; -import javax.ejb.Stateless; - -@Stateless -@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.basicdoclit.Endpoint") -public class EndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(EndpointImpl.class); - - public String echo(String input1, Double input2) - { - if (log.isInfoEnabled()) - { - log.info("echo: " + input1 + " " + input2); - } - return input1; - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-18 09:04:15 UTC (rev 11322) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.benchmark.test.basicdoclit; + +import javax.jws.WebService; + +import org.jboss.logging.Logger; +import javax.ejb.Stateless; + +@Stateless +@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.basicdoclit.Endpoint") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + public String echo(String input1, Double input2) + { + if (log.isInfoEnabled()) + { + log.info("echo: " + input1 + " " + input2); + } + return input1; + } +}