X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=statpages%2FServicesStatus.jsp;h=54ae19d2a12aac67de6a5cfd4f7f3744abf37756;hb=refs%2Fheads%2FJWS-80-VM-root-page;hp=b9c4fb2cc92929be549ac91fafec248cb2a38571;hpb=a97a0a2db24487c4d22ecf959f31b1fea314c579;p=jabaws.git

diff --git a/statpages/ServicesStatus.jsp b/statpages/ServicesStatus.jsp
index b9c4fb2..54ae19d 100644
--- a/statpages/ServicesStatus.jsp
+++ b/statpages/ServicesStatus.jsp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
 <%--
 Author: Peter Troshin
 Date: May 2011
@@ -13,64 +12,176 @@ TODO refactor
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
 
 <c:import url="header.jsp" >
-	<c:param name="title">JABAWS Services Status</c:param>
-</c:import>  
+	<c:param name="title">JABAWS Web Services Status</c:param>
+</c:import>
 <div style="margin: 20px ">
 <h2 style="text-align: center;">JABAWS Services Status</h2>
-<h2 style="text-align: center;">Server: 
-<a href="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}">
-<span style="color: green">${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}</span></a></h2>
+
+<c:set var="host" value="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}" />
+
+<ul style="font-weight:bold;">
+	<li>
+		This servlet tests if the web services are healthy on the tomcat instance on which JABAWS is deployed. <br/>
+		If the tomcat instance is mapped to another "proxy" web server, the servlet does not test availability of <br/>
+		the web services at the endpoints of this external web server.</li>
+	<li>All the web services are tested while this page is being loaded</li>
+	<li>If you want to test the services again, reload this page.</li>
+	<li>Click on the service status to see the results of the testing.</li>
+	<li>Server tested: <a href="${host}">${host}</a> </li>
+	<li>Time of execusion: ${timeexec} msec</li>
+	<li> Your IP is ${pageContext.request.remoteAddr}</li>
+</ul>
+
 <br/>
-<p>All the services were tested while this page was loading. If you want to test the services again, just reload this page. Click on the service status to see the results of the testing.</p>
+<br/>
+<h2 style="text-align: center;color: green">
+	Alignment Web Services
+</h2>
 <table class="its" >
 <thead>
-<tr>
-<th title="The name of the service" width="100px">Service</th>
-<th title="Service status">Status</th>
-</tr>
+	<tr>
+		<th title="Service name" width="100px">Service</th>
+		<th title="Service status">Version</th>
+		<th title="Service status">Status</th>
+		<th title="Service details">Reference and more details</th>
+	</tr>
 </thead>
 <c:forEach items="${results}" var="res" varStatus="status">
-  <c:choose>
-	<c:when test="${status.count%2==0}">
-		<tr class="even">
-	</c:when>
-	<c:otherwise>
-		<tr class="odd">
-	</c:otherwise>
-</c:choose>
-  <td width="100px">${res.service}</td>
-  
-  <td>
-  <c:choose>
-	<c:when test="${res.status}">
-		
-		<div class="source">
-		<div class="header collapsed" onclick=
-		"$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
- 		title="Click to open/close"><span style="color: green">OK</span></div>
-		<div class="body collapsed">
-		<pre>${res.details}</pre>
-		</div>
-		</div>
-	</c:when>
-	<c:otherwise>
-	<div class="source">
-		<div class="header collapsed" onclick=
-		"$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
- 		title="Click to open/close"><span style="color: red">Fail</span></div>
+<c:if test="${res.group=='alignment'}">
+	<c:if test="${status.count%2==0}">
+	<tr class="even">
+	</c:if><c:if test="${status.count%2!=0}">
+	<tr class="odd">
+	</c:if>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
+		<td>${res.version}</td>
+		<c:if test="${res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: green">OK</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<c:if test="${!res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: red">Fail</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<td><div class="source">
+		<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+			title="Click to open/close"><span style="color: brown">INFO</span></div>
 		<div class="body collapsed">
-		<pre>${res.details}</pre>
-		</div>
-	</div>
+		<pre>${res.reference}</pre>
+		</div></div></td>
+	</tr>
+</c:if>
+</c:forEach>
+</table>
 
-	</c:otherwise>
-	</c:choose>
-  </td>
-  
-</tr>
+<br/>
+<br/>
+<h2 style="text-align: center;color: green;">
+	Disorder Web Services
+</h2>
+<table class="its" >
+<thead>
+	<tr>
+		<th title="Service name" width="100px">Service</th>
+		<th title="Service status">Version</th>
+		<th title="Service status">Status</th>
+		<th title="Service details">Reference and more details</th>
+	</tr>
+</thead>
+<c:forEach items="${results}" var="res" varStatus="status">
+<c:if test="${res.group=='disorder'}">
+	<c:if test="${status.count%2==0}">
+	<tr class="even">
+	</c:if><c:if test="${status.count%2!=0}">
+	<tr class="odd">
+	</c:if>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
+		<td>${res.version}</td>
+		<c:if test="${res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: green">OK</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<c:if test="${!res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: red">Fail</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<td><div class="source">
+		<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+			title="Click to open/close"><span style="color: brown">INFO</span></div>
+		<div class="body collapsed">
+		<pre>${res.reference}</pre>
+		</div></div></td>
+	</tr>
+</c:if>
+</c:forEach>
+</table>
 
+<br/>
+<br/>
+<h2 style="text-align: center;color: green;">
+	Other Web Services
+</h2>
+<table class="its" >
+<thead>
+	<tr>
+		<th title="Service name" width="100px">Service</th>
+		<th title="Service status">Version</th>
+		<th title="Service status">Status</th>
+		<th title="Service details">Reference and more details</th>
+	</tr>
+</thead>
+<c:forEach items="${results}" var="res" varStatus="status">
+<c:if test="${res.group!='alignment' and res.group!='disorder'}">
+	<c:if test="${status.count%2==0}">
+	<tr class="even">
+	</c:if><c:if test="${status.count%2!=0}">
+	<tr class="odd">
+	</c:if>
+		<td width="100px"><a href="${host}/${res.service}?wsdl">${res.service}</a></td>
+		<td>${res.version}</td>
+		<c:if test="${res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: green">OK</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<c:if test="${!res.status}">
+			<td><div class="source">
+			<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+				title="Click to open/close"><span style="color: red">Fail</span></div>
+			<div class="body collapsed">
+			<pre>${res.details}</pre>
+			</div></div></td>
+		</c:if>
+		<td><div class="source">
+		<div class="header collapsed" onclick="$(this).toggleClassName('collapsed'); $(this).next('.body').toggleClassName('collapsed');"
+			title="Click to open/close"><span style="color: brown">INFO</span></div>
+		<div class="body collapsed">
+		<pre>${res.reference}</pre>
+		</div></div></td>
+	</tr>
+</c:if>
 </c:forEach>
 </table>
+
 <p>If you would like to integrate JABAWS with automated health check system you may want to use 
 the HTTP code response service checker. It responds with HTTP status code depending on the status 
 of the web service.