nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Centralized versionning, and web server ressources cache fooling

Browse Source
This commit is contained in:
Claude Brisson
2024-01-27 09:44:21 +01:00
parent c350d58290
commit 10bf5b41b6
9 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
view-webapp/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.jeudego.pairgoth</groupId>
<artifactId>engine-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.2-SNAPSHOT</version>
</parent>
<artifactId>view-webapp</artifactId>
@@ -84,6 +84,7 @@
</httpConnector>
<systemProperties>
<pairgoth.env>${pairgoth.env}</pairgoth.env>
<pairgoth.version>${pairgoth.version}</pairgoth.version>
<pairgoth.api.external.url>${pairgoth.api.external.url}</pairgoth.api.external.url>
<pairgoth.webapp.external.url>${pairgoth.webapp.external.url}</pairgoth.webapp.external.url>
<pairgoth.store>${pairgoth.store}</pairgoth.store>

8
view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt
View File

@@ -64,11 +64,11 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H
properties[(key as String).removePrefix(PAIRGOTH_PROPERTIES_PREFIX)] = value
}
val env = properties.getProperty("env")
logger.info("Using profile {}", )
logger.info("pairgoth server ${properties["version"]} with profile ${properties["env"]}")
// let the view be aware of the environment
context.setAttribute("env", env)
// publish some properties to the webapp context; for easy access from the template
context.setAttribute("env", properties["env"])
context.setAttribute("version", properties["version"] ?: "?")
// set system user agent string to empty string
System.setProperty("http.agent", "")

12
view-webapp/src/main/webapp/WEB-INF/layouts/standard.html
View File

@@ -60,7 +60,7 @@
</div>
</div>
<div id="footer" class="horz flex">
<div id="version">pairgoth v0.1</div>
<div id="version">pairgoth v$version</div>
<div id="contact"><a href="mailto:pairgoth@jeudego.org">contact</a></div>
</div>
<div id="feedback">
@@ -81,13 +81,13 @@
<script type="text/javascript" src="/lib/tablesort-5.4.0/sorts/tablesort.number.min.js"></script>
<link rel="stylesheet" href="/lib/tablesort-5.4.0/tablesort.css"/>
<script type="text/javascript" src="/lib/imaskjs-7.1.3/imask.min.js"></script>
<script type="text/javascript" src="/js/api.js"></script>
<script type="text/javascript" src="/js/main.js"></script>
<script type="text/javascript" src="/js/domhelper.js"></script>
<script type="text/javascript" src="/js/api.js?v=$version"></script>
<script type="text/javascript" src="/js/main.js?v=$version"></script>
<script type="text/javascript" src="/js/domhelper.js?v=$version"></script>
<link rel="stylesheet" href="/lib/fork-awesome-1.2.0/fork-awesome.min.css"/>
<link rel="stylesheet" href="/css/main.css"/>
<link rel="stylesheet" href="/css/main.css?v=$version"/>
#if($css)
<link rel="stylesheet" href="$css"/>
<link rel="stylesheet" href="${css}?v=$version"/>
#end
<script type="text/javascript">
const lang = '${request.lang}';