From jbossws-commits at lists.jboss.org Mon Oct 12 09:26:25 2009
Content-Type: multipart/mixed; boundary="===============3818284007063844324=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r10891 -
 framework/trunk/src/main/java/org/jboss/wsf/framework/management.
Date: Mon, 12 Oct 2009 09:26:25 -0400
Message-ID: <200910121326.n9CDQPFn023905@svn01.web.mwc.hst.phx2.redhat.com>

--===============3818284007063844324==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2009-10-12 09:26:25 -0400 (Mon, 12 Oct 2009)
New Revision: 10891

Modified:
   framework/trunk/src/main/java/org/jboss/wsf/framework/management/Context=
Servlet.java
Log:
[JBWS-2783] Fix context servlet


Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/=
ContextServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/Contex=
tServlet.java	2009-10-12 13:24:25 UTC (rev 10890)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/Contex=
tServlet.java	2009-10-12 13:26:25 UTC (rev 10891)
@@ -23,6 +23,7 @@
 =

 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URI;
 import java.net.URL;
 import java.util.Set;
 =

@@ -103,8 +104,7 @@
          writer.print("</tr>");
          writer.print("<tr>");
          writer.print("	<td>Endpoint Address</td>");
-         String address =3D createAddress(requestURL, ep.getAddress());
-         writer.print("	<td><a href=3D'" + address + "?wsdl'>" + address +=
 "?wsdl</a></td>");
+         writer.print("	<td>" + getAddressHtmlTag(requestURL, ep) + "</td>=
");
          writer.print("</tr>");
          writer.print("<tr>");
          writer.print("	<td colspan=3D2>");
@@ -181,6 +181,29 @@
       writer.println("</head>");
    }
    =

+   private String getAddressHtmlTag(final URL requestURL, final Endpoint e=
p) throws IOException
+   {
+      String address =3D createAddress(requestURL, ep.getAddress());
+      try
+      {
+         String scheme =3D new URI(address).getScheme();
+         if (scheme.equalsIgnoreCase("jms"))
+         {
+            return ep.getAddress();
+         }
+      }
+      catch (Exception e)
+      {
+         //ignore
+      }
+      StringBuilder sb =3D new StringBuilder("<a href=3D'");
+      sb.append(address);
+      sb.append("?wsdl'>");
+      sb.append(address);
+      sb.append("</a>");
+      return sb.toString();
+   }
+   =

    private String createAddress(final URL requestURL, final String endpoin=
tAddress) throws IOException
    {
       String address =3D endpointAddress;


--===============3818284007063844324==--