Adapt version output to changes in Helma

This commit is contained in:
Tobi Schäfer 2024-06-15 22:44:31 +02:00
parent 508c193c50
commit e26760bdc4
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
2 changed files with 20 additions and 6 deletions

View file

@ -120,19 +120,31 @@
<h3 class='uk-panel-title'><% gettext Versions %></h3>
<dl class='uk-description-list-horizontal'>
<dt><% gettext Antville %></dt>
<dd>φ (<% version %>)</dd>
<dd title='The phinal version'>φ (<% version %>)</dd>
<dt><% gettext Commit %></dt>
<dd>
<% link <% version hash prefix='https://github.com/antville/antville/commit/' %> <% version hash %> %> (<% version date %>)
<a href='https://github.com/antville/antville/commit/<% version hash %>'>
<% version hash %>
</a>
(<% version date %>)
</dd>
<dt><% gettext "Application Server" %></dt>
<dd><a href="https://github.com/antville/helma">Helma</a> <% param.helma %></dd>
<dd>
<a href='https://github.com/antville/helma/commit/<% param.helmaCommitHash %>'>
Helma <% param.helmaVersion %> <% param.helmaCommitHash %>
</a>
(<% param.helmaBuildDate %>)
</dd>
<dt><% gettext "Scripting Engine" %></dt>
<dd><a href="https://github.com/mozilla/rhino"><% param.rhino %></a></dd>
<dt><% gettext "Webserver" %></dt>
<dd><a href="https://github.com/jetty/jetty.project">Jetty <% param.jetty %></a></dd>
<dt><% gettext "Servlet Interface" %></dt>
<dd><a href="https://docs.oracle.com/javaee/7/api/index.html?javax/servlet/package-summary.html">Javax <% param.servlet %></a></dd>
<dd>
<a href="https://docs.oracle.com/javaee/7/api/index.html?javax/servlet/package-summary.html">
Javax <% param.servlet %>
</a>
</dd>
<dt><% gettext "Virtual Machine" %></dt>
<dd><a href="https://openjdk.org">Java <% param.java %></a></dd>
</dl>

View file

@ -28,7 +28,7 @@ Root.VERSION = (function(versionString, buildDate) {
var parts = re.exec(versionString);
if (parts) {
var result = {
date: new Date(buildDate).toLocaleDateString(),
date: buildDate,
hash: parts[4],
major: parts[1],
parts: parts,
@ -265,7 +265,9 @@ Root.prototype.health_action = function() {
usedMemory: formatNumber(totalMemory - freeMemory),
sessions: formatNumber(app.countSessions()),
cacheSize: formatNumber(getProperty('cacheSize')),
helma: Packages.helma.main.Server.server.version,
helmaVersion: Packages.helma.main.Server.server.version,
helmaBuildDate: Packages.helma.main.Server.server.buildDate,
helmaCommitHash: Packages.helma.main.Server.server.commitHash,
jetty: Packages.org.eclipse.jetty.util.Jetty.VERSION,
rhino: Packages.org.mozilla.javascript.ImplementationVersion.get(),
servlet: Packages.java.lang.Class.forName('javax.servlet.Servlet').package.specificationVersion,