diff options
| author | Jonathan Bauer | 2019-02-27 12:46:30 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2019-02-27 12:46:30 +0100 |
| commit | 79693686c8ba14bd67affe7f3f1ecebafc637439 (patch) | |
| tree | 091e0e22ce342d993797ccb3d354f5f2964cea76 | |
| parent | [client] Make change monitor react to changed runscripts (diff) | |
| download | tutor-module-79693686c8ba14bd67affe7f3f1ecebafc637439.tar.gz tutor-module-79693686c8ba14bd67affe7f3f1ecebafc637439.tar.xz tutor-module-79693686c8ba14bd67affe7f3f1ecebafc637439.zip | |
[client] configurable config dir name
3 files changed, 7 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java index 2eda03e1..ca7dcfcf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Branding.java @@ -58,6 +58,10 @@ public final class Branding { return PROPERTIES.getProperty("service.name", "bwLehrpool"); } + public final static String getConfigDirectory() { + return PROPERTIES.getProperty("config.directory", "bwSuite"); + } + public final static String getServiceEmail() { return PROPERTIES.getProperty("service.email", "bwlehrpool@hs-offenburg.de"); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java index 9c8b0b9e..1e243d5c 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/Config.java @@ -91,7 +91,7 @@ public class Config { } // Check if we got a path - configFile = new File(configPath + File.separatorChar + Branding.getServiceName() + File.separatorChar + configFile = new File(configPath + File.separatorChar + Branding.getConfigDirectory() + File.separatorChar + "config.properties").getAbsoluteFile(); // Check if the directory exists. diff --git a/dozentenmodul/src/main/properties/branding.properties b/dozentenmodul/src/main/properties/branding.properties index f22e8a15..b37e7c70 100644 --- a/dozentenmodul/src/main/properties/branding.properties +++ b/dozentenmodul/src/main/properties/branding.properties @@ -2,4 +2,5 @@ masterserver.address=bwlp-masterserver.ruf.uni-freiburg.de application.name=bwLehrpool-Suite service.name=bwLehrpool service.faq.website=https://www.bwlehrpool.de -service.email=bwlehrpool@hs-offenburg.de
\ No newline at end of file +service.email=bwlehrpool@hs-offenburg.de +config.directory=bwSuite
\ No newline at end of file |