Author: richard.opalka(a)jboss.com Date: 2008-09-17 09:48:08 -0400 (Wed, 17 Sep 2008) New Revision: 8177 Modified: stack/native/trunk/.classpath stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java Log: [JBWS-1397] remove obsolete FIXME Modified: stack/native/trunk/.classpath =================================================================== --- stack/native/trunk/.classpath 2008-09-16 16:37:15 UTC (rev 8176) +++ stack/native/trunk/.classpath 2008-09-17 13:48:08 UTC (rev 8177) @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/saaj/src/main/java"/> - <classpathentry kind="src" path="modules/testsuite/framework-tests/target/wsconsume/java"/> <classpathentry kind="src" path="modules/testsuite/native-tests/target/wsconsume/java"/> - <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/> <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/> <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/> <classpathentry kind="src" path="modules/jaxws/src/main/java"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-09-16 16:37:15 UTC (rev 8176) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-09-17 13:48:08 UTC (rev 8177) @@ -56,23 +56,9 @@ if (port == null) { - if (!isTargetJBoss50()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); - port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - } - else - { - System.out.println("FIXME [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); - QName qname = new QName("http://org.jboss.ws/samples/jsr109pojo", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-rpc"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); + port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } }