Merge branch 'master' into feature/15-archive-view-url

Fin Reinhard

22.51.2019 1c087fae322a1b07bb7bd554ee10ff473c47c727

 borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java

@@ -18,6 +18,7 @@

    private int port = WEBSERVER_PORT_DEFAULT;
    private boolean webDevelopmentMode = WEB_DEVELOPMENT_MODE_PREF_DEFAULT;
    private BorgVersion borgVersion = new BorgVersion();
    @JsonProperty
    public String getCacheDir() {
        return ButlerCache.getInstance().getCacheDir().getAbsolutePath();
@@ -31,6 +32,17 @@
        return SUPPORTED_LANGUAGES;
    }

    /**
     * @return a clone of this.borgVersion.
     */
    public BorgVersion getBorgVersion() {
        return new BorgVersion().copyFrom(borgVersion);
    }

    BorgVersion _getBorgVersion() {
        return this.borgVersion;
    }

    public static String getApplicationHome() {
        if (applicationHome == null) {
            applicationHome = System.getProperty("applicationHome");
@@ -65,5 +77,7 @@
        super.copyFrom(other);
        this.port = other.port;
        this.webDevelopmentMode = other.webDevelopmentMode;
        this.borgVersion.copyFrom(other.borgVersion);
        this.setBorgCommand(this.borgVersion.getBorgCommand());
    }
}