display build number in MuStatus

This commit is contained in:
Zlatin Balevsky
2020-03-23 07:59:18 +00:00
parent 4a9cea7d2e
commit b7033e3277
4 changed files with 10 additions and 0 deletions

View File

@ -66,6 +66,7 @@ task generateWebXML {
def jasper = new File("$buildDir/tmp_jsp/web.xml.jasper") def jasper = new File("$buildDir/tmp_jsp/web.xml.jasper")
templateText = templateText.replaceAll("__JASPER__", jasper.text) templateText = templateText.replaceAll("__JASPER__", jasper.text)
templateText = templateText.replaceAll("__VERSION__", project.version) templateText = templateText.replaceAll("__VERSION__", project.version)
templateText = templateText.replaceAll("__BUILD_NUMBER__", project.buildNumber)
def webXml = new File("$buildDir/tmp_jsp/web.xml") def webXml = new File("$buildDir/tmp_jsp/web.xml")
webXml.text = templateText webXml.text = templateText
} }

View File

@ -43,6 +43,7 @@ public class MuWireServlet extends HttpServlet {
throw new ServletException(bad); throw new ServletException(bad);
} }
config.getServletContext().setAttribute("mwClient", client); config.getServletContext().setAttribute("mwClient", client);
config.getServletContext().setAttribute("buildNumber", config.getInitParameter("buildNumber"));
} }
@Override @Override

View File

@ -1,11 +1,14 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" <%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%> pageEncoding="UTF-8"%>
<%@ page import="com.muwire.webui.*" %> <%@ page import="com.muwire.webui.*" %>
<%@ page import="com.muwire.core.*" %>
<%@include file="initcode.jsi"%> <%@include file="initcode.jsi"%>
<% <%
String pagetitle=Util._t("MuWire Status"); String pagetitle=Util._t("MuWire Status");
Core core = (Core) application.getAttribute("core");
String buildNumber = (String)application.getAttribute("buildNumber");
%> %>
@ -22,6 +25,7 @@ String pagetitle=Util._t("MuWire Status");
<%@include file="sidebar.jsi"%> <%@include file="sidebar.jsi"%>
</aside> </aside>
<section class="main foldermain"> <section class="main foldermain">
<h3>MuWire <%=core.getVersion() + "-b" + buildNumber%></h3>
<table> <table>
<tr> <tr>
<td><%=Util._t("Incoming Connections")%></td> <td><%=Util._t("Incoming Connections")%></td>

View File

@ -14,6 +14,10 @@
<param-name>version</param-name> <param-name>version</param-name>
<param-value>__VERSION__</param-value> <param-value>__VERSION__</param-value>
</init-param> </init-param>
<init-param>
<param-name>buildNumber</param-name>
<param-value>__BUILD_NUMBER__</param-value>
</init-param>
</servlet> </servlet>
<servlet> <servlet>