Author: thomas.diesler(a)jboss.com Date: 2007-02-02 08:52:01 -0500 (Fri, 02 Feb 2007) New Revision: 2252 Modified: 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/BenchmarkRpcEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml Log: Fix benchmark context name Modified: 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 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-02-02 13:52:01 UTC (rev 2252) @@ -46,25 +46,13 @@ 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(); + InitialContext iniCtx = getInitialContext("benchmark-client"); Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); } Modified: 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 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252) @@ -46,25 +46,13 @@ 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(); + InitialContext iniCtx = getInitialContext("benchmark-client"); Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); } Modified: 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 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-02-02 13:52:01 UTC (rev 2252) @@ -46,25 +46,13 @@ 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(); + InitialContext iniCtx = getInitialContext("benchmark-client"); Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); } Modified: 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 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-02-02 13:52:01 UTC (rev 2252) @@ -46,25 +46,13 @@ 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(); + InitialContext iniCtx = getInitialContext("benchmark-client"); Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); } Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-02 13:52:01 UTC (rev 2252) @@ -7,11 +7,11 @@ <service-ref> <service-ref-name>service/BenchmarkJSE</service-ref-name> - <wsdl-override>http://localhost:8080/benchmark-doc?wsdl</wsdl-override> + <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/BenchmarkEJB</service-ref-name> - <wsdl-override>http://localhost:8080/benchmark-doc-ejb?wsdl</wsdl-override> + <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc-ejb?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2007-02-02 13:52:01 UTC (rev 2252) @@ -8,7 +8,7 @@ <ejb-name>BenchmarkDocLit</ejb-name> <port-component> <port-component-name>BenchmarkDocLitEJBWS</port-component-name> - <port-component-uri>/benchmark-doc-ejb/*</port-component-uri> + <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri> </port-component> </session> </enterprise-beans> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2007-02-02 13:52:01 UTC (rev 2252) @@ -7,11 +7,11 @@ <service-ref> <service-ref-name>service/BenchmarkJSE</service-ref-name> - <wsdl-override>http://localhost:8080/benchmark-rpc?wsdl</wsdl-override> + <wsdl-override>http://localhost:8080/jaxrpc-benchmark-rpc?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/BenchmarkEJB</service-ref-name> - <wsdl-override>http://localhost:8080/benchmark-rpc-ejb?wsdl</wsdl-override> + <wsdl-override>http://localhost:8080/jaxrpc-benchmark-rpc-ejb?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-02-02 13:25:09 UTC (rev 2251) +++ trunk/jbossws-tests/src/main/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2007-02-02 13:52:01 UTC (rev 2252) @@ -8,7 +8,7 @@ <ejb-name>BenchmarkRpcLit</ejb-name> <port-component> <port-component-name>BenchmarkRpcLitEJBWS</port-component-name> - <port-component-uri>/benchmark-rpc-ejb/*</port-component-uri> + <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri> </port-component> </session> </enterprise-beans>