Fix TUSCANY-3269 (use host from ?wsdl request in returned WSDL)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814373 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 21 deletions

diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
index b276d8210f..186d2ad746 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
@@ -35,7 +35,6 @@ import javax.xml.namespace.QName;
 

 import junit.framework.TestCase;

 

-import org.apache.axis2.transport.http.server.HttpUtils;

 import org.apache.tuscany.sca.host.embedded.SCADomain;

 

 /**

@@ -69,8 +68,7 @@ public class QuestionMarkWSDLImportTestCase extends TestCase {
         Port port = service.getPort("AccountSoapPort");

 

         String endpoint = getEndpoint(port);

-        String ip = HttpUtils.getIpAddress();

-        assertEquals("http://" + ip + ":8086/AccountService", endpoint);

+        assertEquals("http://localhost:8086/AccountService", endpoint);

     }

 

     private String getEndpoint(Port port) {

diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
index 0d10881e7b..c0133a712e 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
@@ -35,17 +35,14 @@ import javax.xml.namespace.QName;
 

 import junit.framework.TestCase;

 

-import org.apache.axis2.transport.http.server.HttpUtils;

 import org.apache.tuscany.sca.host.embedded.SCADomain;

 

 /**

  * Test ?wsdl works and that the returned WSDL has the correct endpoint

  * 

- * ********* Currently broken, see TUSCANY-2942

- *

  * @version $Rev: 660340 $ $Date: 2008-05-27 01:08:32 +0100 (Tue, 27 May 2008) $

  */

-public class QuestionMarkWSDLIncludeTestCaseFIXME extends TestCase {

+public class QuestionMarkWSDLIncludeTestCase extends TestCase {

 

     private SCADomain domain;

 

@@ -71,8 +68,7 @@ public class QuestionMarkWSDLIncludeTestCaseFIXME extends TestCase {
         Port port = service.getPort("AccountSoapPort");

 

         String endpoint = getEndpoint(port);

-        String ip = HttpUtils.getIpAddress();

-        assertEquals("http://" + ip + ":8085/AccountService", endpoint);

+        assertEquals("http://localhost:8085/AccountService", endpoint);

     }

 

     private String getEndpoint(Port port) {

diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
index 0508f28e11..0ca84a910e 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
@@ -35,7 +35,6 @@ import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
 
-import org.apache.axis2.transport.http.server.HttpUtils;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 /**
@@ -70,8 +69,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         Port port = service.getPort("HelloWorldSoapPort");
 
         String endpoint = getEndpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/services/HelloWorldWebService", endpoint);
+        assertEquals("http://localhost:8085/services/HelloWorldWebService", endpoint);
     }
 
     /**
@@ -97,8 +95,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         Port port = service.getPort("HelloWorldPort");
 
         String endpoint = getEndpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/foo/bar", endpoint);
+        assertEquals("http://localhost:8085/foo/bar", endpoint);
     }
 
     protected String getEndpoint(Port port) {
diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 8d378565d4..ee866f77ec 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
@@ -32,7 +32,6 @@ import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
 
-import org.apache.axis2.transport.http.server.HttpUtils;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 /**
@@ -61,8 +60,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
 
         String endpoint = getSOAP11Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep1", endpoint);
+        assertEquals("http://localhost:8085/ep1", endpoint);
     }
 
     /**
@@ -81,8 +79,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
 
         String endpoint = getSOAP11Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep2", endpoint);
+        assertEquals("http://localhost:8085/ep2", endpoint);
     }
 
     /**
@@ -101,8 +98,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP12port_http");
 
         String endpoint = getSOAP12Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep3", endpoint);
+        assertEquals("http://localhost:8085/ep3", endpoint);
     }
 
     protected String getSOAP11Endpoint(Port port) {