ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r905830 - in /webservices/axis2/trunk/java/modules/jaxws: pom.xml test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java
Date Tue, 02 Feb 2010 23:01:23 GMT
Author: veithen
Date: Tue Feb  2 23:01:22 2010
New Revision: 905830

URL: http://svn.apache.org/viewvc?rev=905830&view=rev
Log:
Fixed an issue in r903677 (related to AXIS2-4596) that caused a build failure on Mac OS X
due to some incorrect URL manipulations.

Modified:
    webservices/axis2/trunk/java/modules/jaxws/pom.xml
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java

Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?rev=905830&r1=905829&r2=905830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Tue Feb  2 23:01:22 2010
@@ -128,6 +128,9 @@
                     <include>**/*.properties</include>
                 </includes>
             </testResource>
+            <testResource>
+                <directory>test-resources</directory>
+            </testResource>
         </testResources>
         <plugins>
             <plugin>

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java?rev=905830&r1=905829&r2=905830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/addressing/UsingAddressingTests.java
Tue Feb  2 23:01:22 2010
@@ -75,8 +75,7 @@
     // Check addressing is disabled when <wsaw:UsingAddressing /> is NOT used in
     // the WSDL
     public void testWithoutUsingAddressing() {
-        String wsdlLocation = "file:///" + System.getProperty("basedir", ".")
-                + "/" + "test-resources/wsdl/Test.wsdl";
+        String wsdlLocation = getClass().getResource("/wsdl/Test.wsdl").toExternalForm();
         try {
             Service svc = Service.create(new URL(wsdlLocation), serviceQName);
             Sample s = svc.getPort(portQName, Sample.class);
@@ -97,8 +96,7 @@
     // Check addressing is enabled when <wsaw:UsingAddressing /> is used in the
     // WSDL.
     public void testUsingAddressing() {
-        String wsdlLocation = "file:///" + System.getProperty("basedir", ".")
-                + "/" + "test-resources/wsdl/UsingAddressing.wsdl";
+        String wsdlLocation = getClass().getResource("/wsdl/UsingAddressing.wsdl").toExternalForm();
         try {
             Service svc = Service.create(new URL(wsdlLocation), serviceQName);
             Sample s = svc.getPort(portQName, Sample.class);
@@ -122,8 +120,7 @@
     // Check addressing is enabled when <wsaw:UsingAddressing
     // wsdl:required="false" /> is used in the WSDL
     public void testUsingAddressingOptional() {
-        String wsdlLocation = "file:///" + System.getProperty("basedir", ".")
-                + "/" + "test-resources/wsdl/UsingAddressingOptional.wsdl";
+        String wsdlLocation = getClass().getResource("/wsdl/UsingAddressingOptional.wsdl").toExternalForm();
         try {
             Service svc = Service.create(new URL(wsdlLocation), serviceQName);
             Sample s = svc.getPort(portQName, Sample.class);
@@ -147,8 +144,7 @@
     // Check addressing is enabled when <wsaw:UsingAddressing
     // wsdl:required="true" /> is used in the WSDL
     public void testUsingAddressingRequired() {
-        String wsdlLocation = "file:///" + System.getProperty("basedir", ".")
-                + "/" + "test-resources/wsdl/UsingAddressingRequired.wsdl";
+        String wsdlLocation = getClass().getResource("/wsdl/UsingAddressingRequired.wsdl").toExternalForm();
         try {
             Service svc = Service.create(new URL(wsdlLocation), serviceQName);
             Sample s = svc.getPort(portQName, Sample.class);



Mime
View raw message