Commit c0d60929 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.2-dev' into 'v4.x-master'

131: Fix issues related to deployment of upcoming v4-release (OPENED)

See merge request !30
parents 6204b59f eeea96f2
Pipeline #26399 passed with stages
in 4 minutes and 38 seconds
......@@ -8,7 +8,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'de.unibamberg.minf'
version = '4.3.3-SNAPSHOT'
version = '4.3.4-SNAPSHOT'
description = 'DARIAH-DE Data Modeling Environment'
......
......@@ -6,7 +6,7 @@ ext {
tilesVersion = "3.0.8"
jodaJspTagsVersion = "1.1.1"
coreVersion = "6.5.3-SNAPSHOT"
coreVersion = "6.5.4-SNAPSHOT"
gtfVersion = "2.3.3-SNAPSHOT"
processingVersion = "4.3.4-SNAPSHOT"
dariahSpVersion = "2.1.7-RELEASE"
......@@ -133,6 +133,10 @@ dependencies {
compileOnly "javax.servlet.jsp:jsp-api:2.2"*/
}
springBoot {
buildInfo()
}
bootWar {
launchScript()
}
......
......@@ -49,7 +49,7 @@ public class WebConfig implements WebMvcConfigurer {
@PostConstruct
public void completeConfiguration() {
if (localization.getBaseNames()==null) {
localization.setBaseNames("classpath:i18n/messages","/themes/" + theme + "/i18n/theme");
localization.setBaseNames("/themes/" + theme + "/i18n/theme", "classpath:i18n/messages");
}
}
......
......@@ -422,7 +422,7 @@
~de.unibamberg.minf.dme.notification.transformation.available_passthrough_grammars = Weiterleitung
~de.unibamberg.minf.dme.notification.transformation.no_results = Die Verarbeitung des \u00FCbergebenen Input lieferte keine Ergebnisse
~de.unibamberg.minf.dme.registry.title = Datenmodelle und Mappings
~de.unibamberg.minf.dme.title = Data Modeling Environment (DME)
~de.unibamberg.minf.dme.title = DARIAH-DE Data Modeling Environment
~de.unibamberg.minf.dme.title_short = DME
~de.unibamberg.minf.dme.view.home.title = Liste der Datenmodelle
~de.unibamberg.minf.dme.view.home.title_short = Datenmodelle
......
......@@ -422,7 +422,7 @@
~de.unibamberg.minf.dme.notification.transformation.available_passthrough_grammars = Passthrough
~de.unibamberg.minf.dme.notification.transformation.no_results = Processing of provided input produced no results.
~de.unibamberg.minf.dme.registry.title = Datamodels und Mappings
~de.unibamberg.minf.dme.title = Data Modeling Environment (DME)
~de.unibamberg.minf.dme.title = DARIAH-DE Data Modeling Environment
~de.unibamberg.minf.dme.title_short = DME
~de.unibamberg.minf.dme.view.home.title = List of datamodels
~de.unibamberg.minf.dme.view.home.title_short = Datamodels
......
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<head>
<meta charset="utf-8">
<title><tiles:insertAttribute name="title"/></title>
<title><s:message code="~de.unibamberg.minf.dme.title" /></title>
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="author" content="Tobias Gradl, University of Bamberg">
<meta name="description" content="<tiles:insertAttribute name="title" />">
<meta name="description" content="<s:message code="~de.unibamberg.minf.dme.title" />">
<tiles:importAttribute name="genericStyles" />
<c:forEach items="${genericStyles}" var="css">
<link rel="stylesheet" href="<s:url value="/resources/css/${css}" />" type="text/css" media="screen, projection" />
......
Subproject commit be962398b220fc7fc2bfc7fd62c610ff33153391
Subproject commit e6a2eda558cc14639c280e7675d56eeeef76fb25
Subproject commit 90cbed2c64e2e6993daf2abeb92a56cdda27f3f2
Subproject commit ad24b3019ac1fd234c76b119bff776157e2bebc2
Subproject commit 1feafba0d8b4405dee29615c569d88f97c6ad723
Subproject commit a0b12779054b4a6f9128d7f49500f23b7211f0f5
Subproject commit b0a4a681cbfab4cee147432ead86a9dd4c271076
Subproject commit bffbb96dde2114c810ead39f0f8a7f31a053f8e8
Subproject commit 81e735c155cd5f5cb10a1197c8884439ee7b8baf
Subproject commit e0dc2ffbf9ed8ab57e37652f9ae1c073338c90a4
Subproject commit 43b0b3e9e428a3a19ac50333e33cfd077389c27b
Subproject commit a045dd9f2ce65f5005d4975f3e76dca774f411d4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment