[jbossws-commits] JBossWS SVN: r8993 - framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2009-01-08 11:25:34 -0500 (Thu, 08 Jan 2009)
New Revision: 8993

Modified:
   framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
Log:
[JBPAPP-1559] services page does not correctly update host address of endpoints.

Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java	2009-01-08 15:49:23 UTC (rev 8992)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java	2009-01-08 16:25:34 UTC (rev 8993)
@@ -105,7 +105,8 @@
          writer.print("</tr>");
          writer.print("<tr>");
          writer.print("	<td>Endpoint Address</td>");
-         writer.print("	<td><a href='" + ep.getAddress() + "?wsdl'>" + ep.getAddress() + "?wsdl</a></td>");
+         String address = createAddress(requestURL, ep.getAddress());
+         writer.print("	<td><a href='" + address + "?wsdl'>" + address + "?wsdl</a></td>");
          writer.print("</tr>");
          writer.print("<tr>");
          writer.print("	<td colspan=2>");
@@ -181,4 +182,30 @@
       writer.println("<link rel='stylesheet' href='./styles.css'>");
       writer.println("</head>");
    }
+   
+   private String createAddress(final URL requestURL, final String endpointAddress) throws IOException
+   {
+      String address = endpointAddress;
+      if (address.contains(ServerConfig.UNDEFINED_HOSTNAME))
+      {
+         URL internalAddress = new URL(address);
+
+         String protocol = requestURL.getProtocol();
+         String host = requestURL.getHost();
+         int port = requestURL.getPort();
+         String path = internalAddress.getPath();
+
+         if (port > -1)
+         {
+            address = new URL(protocol, host, port, path).toString();
+         }
+         else
+         {
+            address = new URL(protocol, host, path).toString();
+         }
+      }
+
+      return address;
+   }
+   
 }