diff --git a/webui/build.gradle b/webui/build.gradle index 00e5daa8..a111b30f 100644 --- a/webui/build.gradle +++ b/webui/build.gradle @@ -66,6 +66,7 @@ task generateWebXML { def jasper = new File("$buildDir/tmp_jsp/web.xml.jasper") templateText = templateText.replaceAll("__JASPER__", jasper.text) templateText = templateText.replaceAll("__VERSION__", project.version) + templateText = templateText.replaceAll("__BUILD_NUMBER__", project.buildNumber) def webXml = new File("$buildDir/tmp_jsp/web.xml") webXml.text = templateText } diff --git a/webui/src/main/java/com/muwire/webui/MuWireServlet.java b/webui/src/main/java/com/muwire/webui/MuWireServlet.java index 14b32f93..41b5f20b 100644 --- a/webui/src/main/java/com/muwire/webui/MuWireServlet.java +++ b/webui/src/main/java/com/muwire/webui/MuWireServlet.java @@ -43,6 +43,7 @@ public class MuWireServlet extends HttpServlet { throw new ServletException(bad); } config.getServletContext().setAttribute("mwClient", client); + config.getServletContext().setAttribute("buildNumber", config.getInitParameter("buildNumber")); } @Override diff --git a/webui/src/main/webapp/MuStatus.jsp b/webui/src/main/webapp/MuStatus.jsp index a2258104..52e7c61a 100644 --- a/webui/src/main/webapp/MuStatus.jsp +++ b/webui/src/main/webapp/MuStatus.jsp @@ -1,11 +1,14 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="com.muwire.webui.*" %> +<%@ page import="com.muwire.core.*" %> <%@include file="initcode.jsi"%> <% 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"%>
+

MuWire <%=core.getVersion() + "-b" + buildNumber%>

diff --git a/webui/templates/web.xml.template b/webui/templates/web.xml.template index 8d6bfe4c..b2aa92bd 100644 --- a/webui/templates/web.xml.template +++ b/webui/templates/web.xml.template @@ -14,6 +14,10 @@ version__VERSION__ + + buildNumber + __BUILD_NUMBER__ +
<%=Util._t("Incoming Connections")%>