[jbossws-commits] JBossWS SVN: r6598 - stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-04-21 23:19:05 -0400 (Mon, 21 Apr 2008)
New Revision: 6598

Modified:
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
Log:
Use getResourceURL()

Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java	2008-04-21 19:39:19 UTC (rev 6597)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java	2008-04-22 03:19:05 UTC (rev 6598)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.ws.jaxws.cxf.wsrm;
 
-import java.io.File;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
@@ -65,7 +64,7 @@
 
    public void _testStandardClient() throws Exception
    {
-      URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl").toURL();
+      URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
       QName serviceName = new QName(targetNS, "RMService");
 
       Service service = Service.create(wsdlURL, serviceName);
@@ -80,11 +79,11 @@
    public void testSpringClient() throws Exception
    {
       SpringBusFactory bf = new SpringBusFactory();
-      URL cxfConfig = new File("resources/jaxws/cxf/wsrm/wsrm-client-config.xml").toURL();
+      URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
       Bus bus = bf.createBus(cxfConfig);
       BusFactory.setDefaultBus(bus);
 
-      URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl").toURL();
+      URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl");
       QName serviceName = new QName(targetNS, "RMService");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java	2008-04-21 19:39:19 UTC (rev 6597)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java	2008-04-22 03:19:05 UTC (rev 6598)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.ws.jaxws.cxf.wsrm;
 
-import java.io.File;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
@@ -65,14 +64,14 @@
 
    public void _testStandardClient() throws Exception
    {
-      URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl").toURL();
+      URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
       QName serviceName = new QName(targetNS, "RMService");
 
       Service service = Service.create(wsdlURL, serviceName);
       BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class);
 
       System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only");
-      
+
       Object retObj = port.echo("Hello");
       assertEquals("Hello", retObj);
    }
@@ -80,11 +79,11 @@
    public void testSpringClient() throws Exception
    {
       SpringBusFactory bf = new SpringBusFactory();
-      URL cxfConfig = new File("resources/jaxws/cxf/wsrm/wsrm-client-config.xml").toURL();
+      URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml");
       Bus bus = bf.createBus(cxfConfig);
       BusFactory.setDefaultBus(bus);
 
-      URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl").toURL();
+      URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl");
       QName serviceName = new QName(targetNS, "RMService");
 
       Service service = Service.create(wsdlURL, serviceName);
@@ -93,7 +92,7 @@
       // Enable addressing
       BindingProvider bp = (BindingProvider)port;
       bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE);
-      
+
       Object retObj = port.echo("Hello");
       assertEquals("Hello", retObj);
    }