merlin -> borgbutler.

Kai Reinhard

14.09.2018 693869e1f15bc4c94e2ab4cd2b0461b9d396af56

merlin -> borgbutler.

 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. ***");
            }

 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");
            }