From 434adeaa0cb944bc4f4b4e7ca3313dd27eeac679 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 17 Apr 2021 22:50:08 +0000
Subject: [PATCH] Gradle hell...
---
borgbutler-server/build.gradle | 6 ------
borgbutler-webapp/build.gradle | 2 ++
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/RunningMode.kt | 2 +-
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/WebConfig.kt | 26 +++++++++++++++++---------
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/borgbutler-server/build.gradle b/borgbutler-server/build.gradle
index 9dbd681..9792c70 100644
--- a/borgbutler-server/build.gradle
+++ b/borgbutler-server/build.gradle
@@ -41,12 +41,6 @@
apply plugin: 'application'
mainClassName = 'de.micromata.borgbutler.server.BorgButlerApplication'
-run() {
-}
-
-run.dependsOn ':borgbutler-webapp:npmBuild'
-// run.dependsOn ':borgbutler-docs:buildWebDoc'
-
apply plugin: 'distribution'
task createVersionProperties(dependsOn: processResources) {
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/RunningMode.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/RunningMode.kt
index 8a6cf72..6c64fb3 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/RunningMode.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/RunningMode.kt
@@ -62,7 +62,7 @@
fun webBundled(): Boolean {
var available = false
- RunningMode::class.java.getResourceAsStream("/web/index.html")?.use {
+ RunningMode::class.java.getResourceAsStream("/webapp/index.html")?.use {
//RunningMode::class.java.getResourceAsStream("/logback-spring.xml")?.use {
log.info("Web app found (is bundled).")
available = true
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/WebConfig.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/WebConfig.kt
index f828af1..ba36c17 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/WebConfig.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/WebConfig.kt
@@ -6,6 +6,7 @@
import org.springframework.web.servlet.ViewResolver
import org.springframework.web.servlet.config.annotation.CorsRegistry
import org.springframework.web.servlet.config.annotation.EnableWebMvc
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
import org.springframework.web.servlet.view.InternalResourceViewResolver
@@ -19,7 +20,7 @@
open fun internalResourceViewResolver(): ViewResolver {
val bean = InternalResourceViewResolver()
if (RunningMode.webBundled()) {
- bean.setPrefix("/web/")
+ bean.setPrefix("/webapp/")
} else {
bean.setPrefix("borgbutler-webapp/build/")
}
@@ -27,16 +28,23 @@
return bean
}
+ override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
+ registry.addResourceHandler("/static/**")
+ .addResourceLocations("/webapp/static/")
+ registry.addResourceHandler("/**")
+ .addResourceLocations("/webapp/")
+ }
+
override fun addCorsMappings(registry: CorsRegistry) {
if (RunningMode.webDevelopment) {
- log.warn("*********************************")
- log.warn("*********** **********")
- log.warn("*********** ATTENTION! **********")
- log.warn("*********** **********")
- log.warn("*********** Running in **********")
- log.warn("*********** dev mode! **********")
- log.warn("*********** **********")
- log.warn("*********************************")
+ log.warn("************************************")
+ log.warn("*********** **********")
+ log.warn("*********** ATTENTION! **********")
+ log.warn("*********** **********")
+ log.warn("*********** Running in **********")
+ log.warn("*********** web dev mode! **********")
+ log.warn("*********** **********")
+ log.warn("************************************")
log.warn("Don't deliver this app in dev mode due to security reasons (CrossOriginFilter is set)!")
registry.addMapping("/**")
}
diff --git a/borgbutler-webapp/build.gradle b/borgbutler-webapp/build.gradle
index 5193a4d..f6485c3 100644
--- a/borgbutler-webapp/build.gradle
+++ b/borgbutler-webapp/build.gradle
@@ -23,3 +23,5 @@
toDir: "${buildDir}/libs"
}
}
+
+task(dist).dependsOn packageWebApp
--
Gitblit v1.10.0