[jboss-cvs] JBossAS SVN: r58612 - in trunk/testsuite/src/main/org/jboss/test/ws: . jaxws/webserviceref

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-18 12:19:08 -0500 (Sat, 18 Nov 2006)
New Revision: 58612

Modified:
   trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
   trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java
   trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
   trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java
   trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java
Log:
Update resource location and jboss server target test

Modified: trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java	2006-11-18 17:03:02 UTC (rev 58611)
+++ trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java	2006-11-18 17:19:08 UTC (rev 58612)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.ws;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Hashtable;
@@ -70,6 +71,19 @@
       return delegate.isTargetServerTomcat();
    }
 
+   /**
+    * Locate a classpath resource.
+    * 
+    * @param name
+    * @return
+    */
+   public URL getResource(String name)
+   {
+      ClassLoader loader = Thread.currentThread().getContextClassLoader();
+      URL resURL = loader.getResource(name);
+      return resURL;
+   }
+
    /** Deploy the given archive
     */
    public void deploy(String archive) throws Exception

Modified: trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java	2006-11-18 17:03:02 UTC (rev 58611)
+++ trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java	2006-11-18 17:19:08 UTC (rev 58612)
@@ -57,6 +57,8 @@
    public boolean isTargetServerJBoss()
    {
       String targetServer = System.getProperty("jbossws.target.server");
+      if( targetServer == null )
+         return ! isTargetServerTomcat();
       return "jboss".equals(targetServer);
    }
 
@@ -107,7 +109,7 @@
       }
 
       if (url == null)
-         throw new IllegalArgumentException("Cannot obtain URL for: " + archive);
+         throw new IllegalArgumentException("Cannot obtain URL for: " + archive+", cwd="+new File(".").getAbsolutePath());
 
       return url;
    }

Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java	2006-11-18 17:03:02 UTC (rev 58611)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java	2006-11-18 17:19:08 UTC (rev 58612)
@@ -60,7 +60,7 @@
    
    public void testDynamicProxy() throws Exception
    {
-      URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+      URL wsdlURL = getResource("ws/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl");
       QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
       Service service = Service.create(wsdlURL, qname);
       TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);

Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java	2006-11-18 17:03:02 UTC (rev 58611)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java	2006-11-18 17:19:08 UTC (rev 58612)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.ws.jaxws.webserviceref;
 
-import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -61,7 +60,7 @@
    
    public void testDynamicProxy() throws Exception
    {
-      URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+      URL wsdlURL = super.getResource("ws/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl");
       QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
       Service service = Service.create(wsdlURL, qname);
       TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);

Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java	2006-11-18 17:03:02 UTC (rev 58611)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java	2006-11-18 17:19:08 UTC (rev 58612)
@@ -62,7 +62,7 @@
    
    public void testDynamicProxy() throws Exception
    {
-      URL wsdlURL = new File("output/resources/ws/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+      URL wsdlURL = getResource("ws/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl");
       QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
       Service service = Service.create(wsdlURL, qname);
       TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);