From 693869e1f15bc4c94e2ab4cd2b0461b9d396af56 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 14 Dec 2018 06:09:58 +0000
Subject: [PATCH] merlin -> borgbutler.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/RunningMode.java | 2 +-
borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/RunningMode.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/RunningMode.java
index 74af5ec..e7ec105 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/RunningMode.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/RunningMode.java
@@ -30,7 +30,7 @@
public static boolean isDevelopmentMode() {
if (development == null) {
- development = new File(ServerConfiguration.getApplicationHome(), "merlin-core").exists();
+ development = new File(ServerConfiguration.getApplicationHome(), "borgbutler-core").exists();
if (development) {
log.warn("*** Starting Merlin server in development mode. This mode shouldn't be used in production environments. ***");
}
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
index 1f153e8..38a84fa 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
@@ -76,7 +76,7 @@
try {
Path path;
if (RunningMode.isDevelopmentMode()) {
- path = Paths.get(ServerConfiguration.getApplicationHome(), "merlin-webapp", "build");
+ path = Paths.get(ServerConfiguration.getApplicationHome(), "borgbutler-webapp", "build");
} else {
path = Paths.get(ServerConfiguration.getApplicationHome(), "web");
}
--
Gitblit v1.10.0