Author: heiko.braun(a)jboss.com Date: 2007-01-31 07:02:58 -0500 (Wed, 31 Jan 2007) New Revision: 2215 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Address.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkEJBEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkJSEEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_RequestStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_RequestStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_ResponseStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_RequestStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_ResponseStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_RequestStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_ResponseStruct.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Customer.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/LineItem.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Order.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/OrderBL.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserTypeArray.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Synthetic.java trunk/jbossws-tests/src/main/resources/benchmark/ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/ trunk/jbossws-tests/src/main/resources/benchmark/jmeter/ Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/benchmark/ trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/ Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/ejb-jar.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/webservices.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/config.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/ejb-jar.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/webservices.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/config.xml Log: New package structure for benchmark tests Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-31 12:02:51 UTC (rev 2214) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -53,14 +53,14 @@ </jar> <!-- jaxrpc-benchmark --> - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> @@ -69,12 +69,12 @@ </war> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -84,27 +84,27 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> @@ -113,12 +113,12 @@ </war> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -128,13 +128,13 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Address.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Address.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Address.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,92 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +/** + * A Address. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class Address { + protected String firstName; + protected String lastName; + protected String address1; + protected String address2; + protected String city; + protected String state; + protected String zip; + + public Address() { + } + + public Address(String firstName, String lastName, String address1, String address2, String city, String state, String zip) { + this.firstName = firstName; + this.lastName = lastName; + this.address1 = address1; + this.address2 = address2; + this.city = city; + this.state = state; + this.zip = zip; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getAddress1() { + return address1; + } + + public void setAddress1(String address1) { + this.address1 = address1; + } + + public String getAddress2() { + return address2; + } + + public void setAddress2(String address2) { + this.address2 = address2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.benchmark.jaxrpc; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.rpc.Service; +import java.util.Properties; + +/** + * Test Benchmark EJB Service + * + * @author anders.hedstrom(a)home.se + * @since 9-Nov-2005 + */ +public class BenchmarkDocEJBTestCase extends JBossWSTest +{ + private static BenchmarkService endpoint; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); + } + + /** Get the client's env context + */ + protected InitialContext getInitialContext() throws NamingException + { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); + env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099"); + env.setProperty("j2ee.clientName", "benchmark-client"); + return new InitialContext(env); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + } + + + } + + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } + + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } + + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.benchmark.jaxrpc; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.rpc.Service; +import java.util.Properties; + +/** + * Test Benchmark EJB Service + * + * @author anders.hedstrom(a)home.se + * @since 9-Nov-2005 + */ +public class BenchmarkDocJSETestCase extends JBossWSTest +{ + private static BenchmarkService endpoint; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar"); + } + + /** Get the client's env context + */ + protected InitialContext getInitialContext() throws NamingException + { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); + env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099"); + env.setProperty("j2ee.clientName", "benchmark-client"); + return new InitialContext(env); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + } + } + + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } + + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } + + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkEJBEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkEJBEndpoint.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkEJBEndpoint.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,68 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import javax.ejb.CreateException; +import javax.ejb.EJBException; +import javax.ejb.SessionBean; +import javax.ejb.SessionContext; +import java.rmi.RemoteException; + +/** + * A BenchmarkEJBEndpoint. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class BenchmarkEJBEndpoint implements SessionBean, BenchmarkService +{ + + public SimpleUserType echoSimpleType(SimpleUserType simpleUserType) throws RemoteException + { + return simpleUserType; + } + + public SimpleUserType[] echoArrayOfSimpleUserType(SimpleUserType[] array) throws RemoteException + { + return array; + } + + public Synthetic echoSynthetic(Synthetic synthetic) throws RemoteException + { + return synthetic; + } + + public Order getOrder(int orderId, int customerId) throws RemoteException + { + return (new OrderBL()).getOrder(orderId, customerId); + } + + + // ---- lifecycle methods ------- + public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException + { + } + + public void ejbRemove() throws EJBException, RemoteException + { + } + + public void ejbActivate() throws EJBException, RemoteException + { + + } + + public void ejbPassivate() throws EJBException, RemoteException + { + } + + public void ejbCreate() throws CreateException + { + + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkJSEEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkJSEEndpoint.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkJSEEndpoint.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,40 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.rmi.RemoteException; + +/** + * A BenchmarkJSEEndpoint. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class BenchmarkJSEEndpoint implements BenchmarkService { + + + public SimpleUserType echoSimpleType(SimpleUserType simpleType) throws RemoteException + { + return simpleType; + } + + public SimpleUserType[] echoArrayOfSimpleUserType(SimpleUserType[] array) throws RemoteException + { + return array; + } + + public Synthetic echoSynthetic(Synthetic synthetic) throws RemoteException + { + return synthetic; + } + + public Order getOrder(int orderId, int customerId) throws RemoteException + { + return (new OrderBL()).getOrder(orderId,customerId); + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.benchmark.jaxrpc; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.rpc.Service; +import java.util.Properties; + +/** + * Test Benchmark EJB Service + * + * @author anders.hedstrom(a)home.se + * @since 9-Nov-2005 + */ +public class BenchmarkRpcEJBTestCase extends JBossWSTest +{ + private static BenchmarkService endpoint; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); + } + + /** Get the client's env context + */ + protected InitialContext getInitialContext() throws NamingException + { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); + env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099"); + env.setProperty("j2ee.clientName", "benchmark-client"); + return new InitialContext(env); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + } + } + + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } + + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } + + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.benchmark.jaxrpc; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.rpc.Service; +import java.util.Properties; + +/** + * Test Benchmark EJB Service + * + * @author anders.hedstrom(a)home.se + * @since 9-Nov-2005 + */ +public class BenchmarkRpcJSETestCase extends JBossWSTest +{ + private static BenchmarkService endpoint; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); + } + + /** Get the client's env context + */ + protected InitialContext getInitialContext() throws NamingException + { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); + env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099"); + env.setProperty("j2ee.clientName", "benchmark-client"); + return new InitialContext(env); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + } + } + + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } + + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } + + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,28 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.rmi.Remote; +import java.rmi.RemoteException; + + +/** + * BenchmarkService. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public interface BenchmarkService extends Remote { + + public SimpleUserType echoSimpleType(SimpleUserType simpleUserType) throws RemoteException; + + public SimpleUserType[] echoArrayOfSimpleUserType(SimpleUserType[] array) throws RemoteException; + + public Synthetic echoSynthetic(Synthetic synthetic) throws RemoteException; + + public Order getOrder(int orderId, int customerId) throws RemoteException; +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_RequestStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_RequestStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_RequestStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoArrayOfSimpleUserType_RequestStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] arrayOfSimpleUserType_1; + + public BenchmarkService_echoArrayOfSimpleUserType_RequestStruct() { + } + + public BenchmarkService_echoArrayOfSimpleUserType_RequestStruct(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] arrayOfSimpleUserType_1) { + this.arrayOfSimpleUserType_1 = arrayOfSimpleUserType_1; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] getArrayOfSimpleUserType_1() { + return arrayOfSimpleUserType_1; + } + + public void setArrayOfSimpleUserType_1(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] arrayOfSimpleUserType_1) { + this.arrayOfSimpleUserType_1 = arrayOfSimpleUserType_1; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] result; + + public BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct() { + } + + public BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] result) { + this.result = result; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] getResult() { + return result; + } + + public void setResult(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] result) { + this.result = result; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_RequestStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_RequestStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_RequestStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoSimpleType_RequestStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType SimpleUserType_1; + + public BenchmarkService_echoSimpleType_RequestStruct() { + } + + public BenchmarkService_echoSimpleType_RequestStruct(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType SimpleUserType_1) { + this.SimpleUserType_1 = SimpleUserType_1; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType getSimpleUserType_1() { + return SimpleUserType_1; + } + + public void setSimpleUserType_1(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType SimpleUserType_1) { + this.SimpleUserType_1 = SimpleUserType_1; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_ResponseStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_ResponseStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSimpleType_ResponseStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoSimpleType_ResponseStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType result; + + public BenchmarkService_echoSimpleType_ResponseStruct() { + } + + public BenchmarkService_echoSimpleType_ResponseStruct(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType result) { + this.result = result; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType getResult() { + return result; + } + + public void setResult(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType result) { + this.result = result; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_RequestStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_RequestStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_RequestStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoSynthetic_RequestStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.Synthetic Synthetic_1; + + public BenchmarkService_echoSynthetic_RequestStruct() { + } + + public BenchmarkService_echoSynthetic_RequestStruct(org.jboss.test.ws.benchmark.jaxrpc.Synthetic Synthetic_1) { + this.Synthetic_1 = Synthetic_1; + } + + public org.jboss.test.ws.benchmark.jaxrpc.Synthetic getSynthetic_1() { + return Synthetic_1; + } + + public void setSynthetic_1(org.jboss.test.ws.benchmark.jaxrpc.Synthetic Synthetic_1) { + this.Synthetic_1 = Synthetic_1; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_ResponseStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_ResponseStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_echoSynthetic_ResponseStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_echoSynthetic_ResponseStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.Synthetic result; + + public BenchmarkService_echoSynthetic_ResponseStruct() { + } + + public BenchmarkService_echoSynthetic_ResponseStruct(org.jboss.test.ws.benchmark.jaxrpc.Synthetic result) { + this.result = result; + } + + public org.jboss.test.ws.benchmark.jaxrpc.Synthetic getResult() { + return result; + } + + public void setResult(org.jboss.test.ws.benchmark.jaxrpc.Synthetic result) { + this.result = result; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_RequestStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_RequestStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_RequestStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_getOrder_RequestStruct { + protected int int_1; + protected int int_2; + + public BenchmarkService_getOrder_RequestStruct() { + } + + public BenchmarkService_getOrder_RequestStruct(int int_1, int int_2) { + this.int_1 = int_1; + this.int_2 = int_2; + } + + public int getInt_1() { + return int_1; + } + + public void setInt_1(int int_1) { + this.int_1 = int_1; + } + + public int getInt_2() { + return int_2; + } + + public void setInt_2(int int_2) { + this.int_2 = int_2; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_ResponseStruct.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_ResponseStruct.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkService_getOrder_ResponseStruct.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class BenchmarkService_getOrder_ResponseStruct { + protected org.jboss.test.ws.benchmark.jaxrpc.Order result; + + public BenchmarkService_getOrder_ResponseStruct() { + } + + public BenchmarkService_getOrder_ResponseStruct(org.jboss.test.ws.benchmark.jaxrpc.Order result) { + this.result = result; + } + + public org.jboss.test.ws.benchmark.jaxrpc.Order getResult() { + return result; + } + + public void setResult(org.jboss.test.ws.benchmark.jaxrpc.Order result) { + this.result = result; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Customer.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Customer.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Customer.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,115 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.util.Calendar; + + +/** + * A Customer. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class Customer { + protected int customerId; + protected String contactFirstName; + protected String contactLastName; + protected String contactPhone; + protected Calendar lastActivityDate; + protected String creditCardNumber; + protected String creditCardExpirationDate; + protected Address billingAddress; + protected Address shippingAddress; + + public Customer() { + } + + public Customer(int customerId, String contactFirstName, String contactLastName, String contactPhone, Calendar lastActivityDate, String creditCardNumber, String creditCardExpirationDate, Address billingAddress, Address shippingAddress) { + this.customerId = customerId; + this.contactFirstName = contactFirstName; + this.contactLastName = contactLastName; + this.contactPhone = contactPhone; + this.lastActivityDate = lastActivityDate; + this.creditCardNumber = creditCardNumber; + this.creditCardExpirationDate = creditCardExpirationDate; + this.billingAddress = billingAddress; + this.shippingAddress = shippingAddress; + } + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getContactFirstName() { + return contactFirstName; + } + + public void setContactFirstName(String contactFirstName) { + this.contactFirstName = contactFirstName; + } + + public String getContactLastName() { + return contactLastName; + } + + public void setContactLastName(String contactLastName) { + this.contactLastName = contactLastName; + } + + public String getContactPhone() { + return contactPhone; + } + + public void setContactPhone(String contactPhone) { + this.contactPhone = contactPhone; + } + + public Calendar getLastActivityDate() { + return lastActivityDate; + } + + public void setLastActivityDate(Calendar lastActivityDate) { + this.lastActivityDate = lastActivityDate; + } + + public String getCreditCardNumber() { + return creditCardNumber; + } + + public void setCreditCardNumber(String creditCardNumber) { + this.creditCardNumber = creditCardNumber; + } + + public String getCreditCardExpirationDate() { + return creditCardExpirationDate; + } + + public void setCreditCardExpirationDate(String creditCardExpirationDate) { + this.creditCardExpirationDate = creditCardExpirationDate; + } + + public Address getBillingAddress() { + return billingAddress; + } + + public void setBillingAddress(Address billingAddress) { + this.billingAddress = billingAddress; + } + + public Address getShippingAddress() { + return shippingAddress; + } + + public void setShippingAddress(Address shippingAddress) { + this.shippingAddress = shippingAddress; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/LineItem.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/LineItem.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/LineItem.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,83 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + + +/** + * A LineItem. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class LineItem { + protected int orderId; + protected int itemId; + protected int productId; + protected String productDescription; + protected int orderQuantity; + protected float unitPrice; + + public LineItem() { + } + + public LineItem(int orderId, int itemId, int productId, String productDescription, int orderQuantity, float unitPrice) { + this.orderId = orderId; + this.itemId = itemId; + this.productId = productId; + this.productDescription = productDescription; + this.orderQuantity = orderQuantity; + this.unitPrice = unitPrice; + } + + public int getOrderId() { + return orderId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public int getItemId() { + return itemId; + } + + public void setItemId(int itemId) { + this.itemId = itemId; + } + + public int getProductId() { + return productId; + } + + public void setProductId(int productId) { + this.productId = productId; + } + + public String getProductDescription() { + return productDescription; + } + + public void setProductDescription(String productDescription) { + this.productDescription = productDescription; + } + + public int getOrderQuantity() { + return orderQuantity; + } + + public void setOrderQuantity(int orderQuantity) { + this.orderQuantity = orderQuantity; + } + + public float getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(float unitPrice) { + this.unitPrice = unitPrice; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Order.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Order.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Order.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,102 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.io.Serializable; +import java.util.Calendar; + +/** + * A Order. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class Order implements Serializable +{ + + protected int orderId; + protected int orderStatus; + protected Calendar orderDate; + protected float orderTotalAmount; + protected Customer customer; + protected LineItem[] lineItems; + + public Order() + { + } + + + /** + * @param orderId + * @param orderStatus + * @param orderDate + * @param orderTotalAmount + * @param customer + * @param lineItems + */ + public Order(int orderId, int orderStatus, Calendar orderDate, + float orderTotalAmount, Customer customer, LineItem[] lineItems) + { + super(); + this.orderId = orderId; + this.orderStatus = orderStatus; + this.orderDate = orderDate; + this.orderTotalAmount = orderTotalAmount; + this.customer = customer; + this.lineItems = lineItems; + } + + + public Customer getCustomer() + { + return customer; + } + public void setCustomer(Customer customer) + { + this.customer = customer; + } + public LineItem[] getLineItems() + { + return lineItems; + } + public void setLineItems(LineItem[] lineItems) + { + this.lineItems = lineItems; + } + public Calendar getOrderDate() + { + return orderDate; + } + public void setOrderDate(Calendar orderDate) + { + this.orderDate = orderDate; + } + public int getOrderId() + { + return orderId; + } + public void setOrderId(int orderId) + { + this.orderId = orderId; + } + public int getOrderStatus() + { + return orderStatus; + } + public void setOrderStatus(int orderStatus) + { + this.orderStatus = orderStatus; + } + public float getOrderTotalAmount() + { + return orderTotalAmount; + } + public void setOrderTotalAmount(float orderTotalAmount) + { + this.orderTotalAmount = orderTotalAmount; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/OrderBL.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/OrderBL.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/OrderBL.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,47 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.util.ArrayList; +import java.util.GregorianCalendar; + +/** + * A OrderBL. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class OrderBL { + + public OrderBL() { + } + + public Order getOrder(int orderId, int customerId) + { + int id = 1; + Address ship = new Address("Ship FirstName " + id, "Ship LastName " + id, "Ship StreetAddres " + id, "Street Address Line 2 " + id, "City " + id, "State " + id, "12345"); + Address bill = new Address("Bill FirstName " + id, "Bil1 LastName " + id, "Bill StreetAddres " + id, "Street Address Line 2 " + id, "City " + id, "State " + id, "12345"); + + Customer customer = new Customer(customerId, "FirstName " + id, "LastName " + id, Integer.toString(id), new GregorianCalendar(), Integer.toString(id), Integer.toString(id), bill, ship); + + int numberLineItems = orderId; + + ArrayList lines = new ArrayList(); + + for(int i = 0; i < numberLineItems; i++) + { + LineItem line = new LineItem(orderId, i+1, i, "Test Product " +i, 1, (float) 1.00); + + lines.add(line); + } + + + Order order = new Order(orderId, 1, new GregorianCalendar(), (float) 50, customer, (LineItem[])lines.toArray(new LineItem[0]) ); + + return order; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserType.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserType.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserType.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,65 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.io.Serializable; + +/** + * A SimpleUserType. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class SimpleUserType implements Serializable +{ + + private int i; + private float f; + private String s; + + public SimpleUserType() + { + } + + /** + * @param i + * @param f + * @param s + */ + public SimpleUserType(int i, float f, String s) + { + super(); + this.i = i; + this.f = f; + this.s = s; + } + + public float getF() + { + return f; + } + public void setF(float f) + { + this.f = f; + } + public int getI() + { + return i; + } + public void setI(int i) + { + this.i = i; + } + public String getS() + { + return s; + } + public void setS(String s) + { + this.s = s; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserTypeArray.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserTypeArray.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/SimpleUserTypeArray.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,34 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.benchmark.jaxrpc; + + +public class SimpleUserTypeArray { + private org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] value; + + public SimpleUserTypeArray() { + } + + public SimpleUserTypeArray(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] sourceArray) { + value = sourceArray; + } + + public void fromArray(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] sourceArray) { + this.value = sourceArray; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] toArray() { + return value; + } + + public org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] getValue() { + return value; + } + + public void setValue(org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[] value) { + this.value = value; + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Synthetic.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Synthetic.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/Synthetic.java 2007-01-31 12:02:58 UTC (rev 2215) @@ -0,0 +1,65 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.benchmark.jaxrpc; + +import java.io.Serializable; + +/** + * A Synthetic. + * + * @author <a href=&quot;anders.hedstrom(a)home.se&quot;&gt;Anders Hedstrom</a> + * @version $Revision: 1757 $ + */ +public class Synthetic implements Serializable +{ + private String s; + private SimpleUserType sut; + private byte[] barray; + + public Synthetic() + { + } + + + /** + * @param s + * @param sut + * @param b + */ + public Synthetic(String s, SimpleUserType sut, byte[] b) + { + super(); + this.s = s; + this.sut = sut; + this.barray = b; + } + + public byte[] getB() + { + return barray; + } + public void setB(byte[] b) + { + this.barray = b; + } + public String getS() + { + return s; + } + public void setS(String s) + { + this.s = s; + } + public SimpleUserType getSut() + { + return sut; + } + public void setSut(SimpleUserType sut) + { + this.sut = sut; + } +} Copied: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit (from rev 2211, trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit) Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/META-INF/application-client.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> </port-component-ref> </service-ref> <service-ref> @@ -22,7 +22,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> </port-component-ref> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/META-INF/ejb-jar.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/ejb-jar.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -8,10 +8,11 @@ <enterprise-beans> <session> <ejb-name>BenchmarkDocLit</ejb-name> - <service-endpoint>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkEJBEndpoint</ejb-class> + <service-endpoint>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint> + <ejb-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkEJBEndpoint</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> </session> </enterprise-beans> + </ejb-jar> \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/META-INF/jaxrpc-mapping.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jaxrpc-mapping.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark</namespaceURI> </package-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoArrayOfSimpleUserTypeResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -18,7 +18,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSynthetic_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSynthetic_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSynthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -27,7 +27,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoArrayOfSimpleUserType_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoArrayOfSimpleUserType_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoArrayOfSimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -36,7 +36,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.LineItem</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.LineItem</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:LineItem</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -65,7 +65,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_getOrder_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_getOrder_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:getOrderResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -74,7 +74,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:SimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -91,7 +91,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Synthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -108,7 +108,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_getOrder_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_getOrder_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:getOrder</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -121,7 +121,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Address</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Address</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Address</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -154,7 +154,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSimpleType_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSimpleType_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSimpleType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -163,7 +163,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Customer</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Customer</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Customer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -204,7 +204,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSimpleType_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSimpleType_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSimpleTypeResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -213,7 +213,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSynthetic_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSynthetic_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSyntheticResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -222,7 +222,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Order</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Order</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Order</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -251,7 +251,7 @@ </variable-mapping> </java-xml-type-mapping> <service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkWebService</service-interface> +<service-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkWebService</service-interface> <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/benchmark">serviceNS:BenchmarkWebService</wsdl-service-name> <port-mapping> <port-name>BenchmarkServicePort</port-name> @@ -259,7 +259,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> +<service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/benchmark">portTypeNS:BenchmarkService</wsdl-port-type> <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/benchmark">bindingNS:BenchmarkServiceBinding</wsdl-binding> <service-endpoint-method-mapping> @@ -268,7 +268,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserType</wsdl-message> <wsdl-message-part-name>arrayOfSimpleUserType_1</wsdl-message-part-name> @@ -276,7 +276,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -287,7 +287,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleType</wsdl-message> <wsdl-message-part-name>SimpleUserType_1</wsdl-message-part-name> @@ -295,7 +295,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -306,7 +306,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSynthetic</wsdl-message> <wsdl-message-part-name>Synthetic_1</wsdl-message-part-name> @@ -314,7 +314,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSyntheticResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -342,7 +342,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Order</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Order</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_getOrderResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/META-INF/webservices.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/webservices.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -13,7 +13,7 @@ <port-component> <port-component-name>BenchmarkDocLitEJBWS</port-component-name> <wsdl-port>impl:BenchmarkServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <service-impl-bean> <ejb-link>BenchmarkDocLit</ejb-link> </service-impl-bean> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/WEB-INF/jaxrpc-mapping.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/jaxrpc-mapping.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark</namespaceURI> </package-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoArrayOfSimpleUserType_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoArrayOfSimpleUserTypeResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -18,7 +18,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSynthetic_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSynthetic_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSynthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -27,7 +27,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoArrayOfSimpleUserType_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoArrayOfSimpleUserType_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoArrayOfSimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -36,7 +36,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.LineItem</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.LineItem</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:LineItem</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -65,7 +65,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_getOrder_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_getOrder_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:getOrderResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -74,7 +74,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:SimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -91,7 +91,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Synthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -108,7 +108,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_getOrder_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_getOrder_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:getOrder</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -121,7 +121,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Address</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Address</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Address</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -154,7 +154,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSimpleType_RequestStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSimpleType_RequestStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSimpleType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -163,7 +163,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Customer</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Customer</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Customer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -204,7 +204,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSimpleType_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSimpleType_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSimpleTypeResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -213,7 +213,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService_echoSynthetic_ResponseStruct</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService_echoSynthetic_ResponseStruct</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:echoSyntheticResponse</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -222,7 +222,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Order</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Order</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Order</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -251,7 +251,7 @@ </variable-mapping> </java-xml-type-mapping> <service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkWebService</service-interface> +<service-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkWebService</service-interface> <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/benchmark">serviceNS:BenchmarkWebService</wsdl-service-name> <port-mapping> <port-name>BenchmarkServicePort</port-name> @@ -259,7 +259,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> +<service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/benchmark">portTypeNS:BenchmarkService</wsdl-port-type> <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/benchmark">bindingNS:BenchmarkServiceBinding</wsdl-binding> <service-endpoint-method-mapping> @@ -268,7 +268,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserType</wsdl-message> <wsdl-message-part-name>arrayOfSimpleUserType_1</wsdl-message-part-name> @@ -276,7 +276,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -287,7 +287,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleType</wsdl-message> <wsdl-message-part-name>SimpleUserType_1</wsdl-message-part-name> @@ -295,7 +295,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -306,7 +306,7 @@ <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSynthetic</wsdl-message> <wsdl-message-part-name>Synthetic_1</wsdl-message-part-name> @@ -314,7 +314,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSyntheticResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -342,7 +342,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Order</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Order</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_getOrderResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -7,7 +7,7 @@ <servlet> <servlet-name>BenchmarkServlet</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkJSEEndpoint</servlet-class> + <servlet-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint</servlet-class> </servlet> <servlet-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/WEB-INF/webservices.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -14,7 +14,7 @@ <port-component> <port-component-name>BenchmarkDocLitJSEWS</port-component-name> <wsdl-port>impl:BenchmarkServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <service-impl-bean> <servlet-link>BenchmarkServlet</servlet-link> </service-impl-bean> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/doclit/config.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/config.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -5,10 +5,10 @@ <service name="BenchmarkWebService" targetNamespace="http://org.jboss.ws/benchmark" typeNamespace="http://org.jboss.ws/benchmark/types" - packageName="org.jboss.test.ws.jaxrpc.benchmark"> + packageName="org.jboss.test.ws.benchmark.jaxrpc"> - <interface name="org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService" - servantName="org.jboss.test.ws.jaxrpc.benchmark.BenchmarkJSEEndpoint"/> + <interface name="org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService" + servantName="org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint"/> </service> </configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit (from rev 2211, trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit) Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/META-INF/application-client.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> </port-component-ref> </service-ref> <service-ref> @@ -22,7 +22,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> </port-component-ref> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/META-INF/ejb-jar.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/ejb-jar.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -8,8 +8,8 @@ <enterprise-beans> <session> <ejb-name>BenchmarkRpcLit</ejb-name> - <service-endpoint>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkEJBEndpoint</ejb-class> + <service-endpoint>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint> + <ejb-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkEJBEndpoint</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> </session> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/META-INF/jaxrpc-mapping.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jaxrpc-mapping.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark._arrays.org.jboss.test.ws.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc._arrays.org.jboss.test.ws.benchmark</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types/arrays/org/jboss/test/ws/benchmark</namespaceURI> </package-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.LineItem</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.LineItem</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:LineItem</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -42,7 +42,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:SimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -59,7 +59,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Synthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -76,7 +76,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Address</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Address</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Address</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -109,7 +109,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Customer</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Customer</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Customer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -150,7 +150,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Order</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Order</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Order</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -179,7 +179,7 @@ </variable-mapping> </java-xml-type-mapping> <service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkWebService</service-interface> +<service-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkWebService</service-interface> <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/benchmark">serviceNS:BenchmarkWebService</wsdl-service-name> <port-mapping> <port-name>BenchmarkServicePort</port-name> @@ -187,7 +187,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> +<service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/benchmark">portTypeNS:BenchmarkService</wsdl-port-type> <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/benchmark">bindingNS:BenchmarkServiceBinding</wsdl-binding> <service-endpoint-method-mapping> @@ -195,7 +195,7 @@ <wsdl-operation>echoArrayOfSimpleUserType</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserType</wsdl-message> <wsdl-message-part-name>arrayOfSimpleUserType_1</wsdl-message-part-name> @@ -203,7 +203,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -213,7 +213,7 @@ <wsdl-operation>echoSimpleType</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleType</wsdl-message> <wsdl-message-part-name>SimpleUserType_1</wsdl-message-part-name> @@ -221,7 +221,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -231,7 +231,7 @@ <wsdl-operation>echoSynthetic</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSynthetic</wsdl-message> <wsdl-message-part-name>Synthetic_1</wsdl-message-part-name> @@ -239,7 +239,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSyntheticResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -266,7 +266,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Order</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Order</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_getOrderResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/META-INF/webservices.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/webservices.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -13,7 +13,7 @@ <port-component> <port-component-name>BenchmarkRpcLitEJBWS</port-component-name> <wsdl-port>impl:BenchmarkServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <service-impl-bean> <ejb-link>BenchmarkRpcLit</ejb-link> </service-impl-bean> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc</package-type> <namespaceURI>http://org.jboss.ws/benchmark</namespaceURI> </package-mapping> <package-mapping> -<package-type>org.jboss.test.ws.jaxrpc.benchmark._arrays.org.jboss.test.ws.benchmark</package-type> +<package-type>org.jboss.test.ws.benchmark.jaxrpc._arrays.org.jboss.test.ws.benchmark</package-type> <namespaceURI>http://org.jboss.ws/benchmark/types/arrays/org/jboss/test/ws/benchmark</namespaceURI> </package-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.LineItem</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.LineItem</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:LineItem</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -42,7 +42,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:SimpleUserType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -59,7 +59,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Synthetic</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -76,7 +76,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Address</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Address</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Address</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -109,7 +109,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Customer</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Customer</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Customer</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -150,7 +150,7 @@ </variable-mapping> </java-xml-type-mapping> <java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxrpc.benchmark.Order</java-type> +<java-type>org.jboss.test.ws.benchmark.jaxrpc.Order</java-type> <root-type-qname xmlns:typeNS="http://org.jboss.ws/benchmark/types">typeNS:Order</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -179,7 +179,7 @@ </variable-mapping> </java-xml-type-mapping> <service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkWebService</service-interface> +<service-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkWebService</service-interface> <wsdl-service-name xmlns:serviceNS="http://org.jboss.ws/benchmark">serviceNS:BenchmarkWebService</wsdl-service-name> <port-mapping> <port-name>BenchmarkServicePort</port-name> @@ -187,7 +187,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> +<service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/benchmark">portTypeNS:BenchmarkService</wsdl-port-type> <wsdl-binding xmlns:bindingNS="http://org.jboss.ws/benchmark">bindingNS:BenchmarkServiceBinding</wsdl-binding> <service-endpoint-method-mapping> @@ -195,7 +195,7 @@ <wsdl-operation>echoArrayOfSimpleUserType</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserType</wsdl-message> <wsdl-message-part-name>arrayOfSimpleUserType_1</wsdl-message-part-name> @@ -203,7 +203,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType[]</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType[]</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoArrayOfSimpleUserTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -213,7 +213,7 @@ <wsdl-operation>echoSimpleType</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleType</wsdl-message> <wsdl-message-part-name>SimpleUserType_1</wsdl-message-part-name> @@ -221,7 +221,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.SimpleUserType</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.SimpleUserType</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSimpleTypeResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -231,7 +231,7 @@ <wsdl-operation>echoSynthetic</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</param-type> +<param-type>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSynthetic</wsdl-message> <wsdl-message-part-name>Synthetic_1</wsdl-message-part-name> @@ -239,7 +239,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Synthetic</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Synthetic</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_echoSyntheticResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -266,7 +266,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxrpc.benchmark.Order</method-return-value> +<method-return-value>org.jboss.test.ws.benchmark.jaxrpc.Order</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/benchmark">wsdlMsgNS:BenchmarkService_getOrderResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -7,7 +7,7 @@ <servlet> <servlet-name>BenchmarkServlet</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkJSEEndpoint</servlet-class> + <servlet-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint</servlet-class> </servlet> <servlet-mapping> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/WEB-INF/webservices.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/WEB-INF/webservices.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -14,7 +14,7 @@ <port-component> <port-component-name>BenchmarkRpcLitJSEWS</port-component-name> <wsdl-port>impl:BenchmarkServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> <service-impl-bean> <servlet-link>BenchmarkServlet</servlet-link> </service-impl-bean> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/rpclit/config.xml 2007-01-31 09:53:21 UTC (rev 2211) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/config.xml 2007-01-31 12:02:58 UTC (rev 2215) @@ -5,10 +5,10 @@ <service name="BenchmarkWebService" targetNamespace="http://org.jboss.ws/benchmark" typeNamespace="http://org.jboss.ws/benchmark/types" - packageName="org.jboss.test.ws.jaxrpc.benchmark"> + packageName="org.jboss.test.ws.benchmark.jaxrpc"> - <interface name="org.jboss.test.ws.jaxrpc.benchmark.BenchmarkService" - servantName="org.jboss.test.ws.jaxrpc.benchmark.BenchmarkJSEEndpoint"/> + <interface name="org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService" + servantName="org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint"/> </service> </configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/benchmark/jmeter (from rev 2211, trunk/jbossws-tests/src/main/resources/jaxrpc/benchmark/jmeter)