[jbossws-commits] JBossWS SVN: r6594 - in stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: wssecurity and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-04-21 14:58:44 -0400 (Mon, 21 Apr 2008)
New Revision: 6594

Modified:
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
Log:
Fix resource loading

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -82,7 +82,7 @@
 
       if (subscriptionPort == null || managementPort == null)
       {
-         URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL();
+         URL wsdlURL = getResourceURL("jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl");
          QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService");
 
          Service service = Service.create(wsdlURL, defaultServiceName);

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -67,8 +67,8 @@
    {
       if (usernameDispatch == null)
       {
-         URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
-         URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
+         URL wsdlURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl");
+         URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml");
          QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
          QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameEndpointPort");
 
@@ -81,7 +81,7 @@
       if (encryptDispatch == null)
       {
          URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
-         URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
+         URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml");
          QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
          QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort");
 

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -68,7 +68,7 @@
    private Hello getPort() throws Exception
    {
       URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
-      URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
+      URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml");
       QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -76,7 +76,7 @@
    private Hello getPort() throws Exception
    {
       URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
-      URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL();
+      URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml");
       QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -56,8 +56,8 @@
    {
       if (port == null)
       {
-         URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
-         URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
+         URL wsdlURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl");
+         URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml");
          QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
 
          Service service = Service.create(wsdlURL, serviceName);

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java	2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java	2008-04-21 18:58:44 UTC (rev 6594)
@@ -66,7 +66,7 @@
 
    private Hello getPort() throws Exception
    {
-      URL wsdlURL = new File("resources/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl").toURL();
+      URL wsdlURL = getResourceURL("jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl");
       QName serviceName = new QName("http://org.jboss.ws/samples/wssecuritypolicy", "HelloService");
 
       Service service = Service.create(wsdlURL, serviceName);