Changed loading external kustvakt.conf and jdbc.properties
to use /data folder (#598)
Change-Id: I0431d6fa76e68a90821234f90a626d999b150aac
diff --git a/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
index 392190e..2dd0ae9 100644
--- a/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
@@ -1,12 +1,5 @@
package de.ids_mannheim.korap.server;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Properties;
-
-import de.ids_mannheim.korap.config.FullConfiguration;
-
/**
* pu
*
@@ -19,27 +12,11 @@
KustvaktServer server = new KustvaktServer();
kargs = server.readAttributes(args);
- File f = new File("kustvakt.conf");
- Properties properties = new Properties();
-
- InputStream in = null;
- if (!f.exists()) {
- in = KustvaktServer.class.getClassLoader()
- .getResourceAsStream("kustvakt.conf");
- }
- else {
- in = new FileInputStream(f);
- }
-
- properties.load(in);
- in.close();
-
- config = new FullConfiguration();
- config.loadBasicProperties(properties);
-
+ // EM: why is this necessary?
if (kargs == null)
System.exit(0);
+ server.loadProperties("data/kustvakt.conf", "kustvakt.conf");
server.start();
}
}