commit 13b4a3094eb95703846c9b8d6e56d22c2765a3c4
author margaretha <margaretha@ids-mannheim.de> Thu Mar 15 16:29:11 2018 +0100
committer margaretha <margaretha@ids-mannheim.de> Thu Mar 15 16:29:11 2018 +0100
tree fae8ccdbaac34d1d2762a2cac4c7f2be9d44a715
parent aa3d61344f90de4dc28a0d4a388f73db691e666b

Fixed non hierarchical URI of kustvakt conf files.

Change-Id: Iaa7a8cc0e56c6b5cbf451dd4f4058f1068aeb591

full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java

diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
index caf37e5..35879c8 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 
@@ -25,15 +26,16 @@
         kargs = server.readAttributes(args);
         
         File f = new File("kustvakt.conf");
+        Properties properties = new Properties();
+        
+        InputStream in = null;
         if (!f.exists()){
-            URL url = KustvaktServer.class.getResource("kustvakt.conf");
-            if (url!=null){
-                f = new File(url.toURI());
-            }
+            in = KustvaktServer.class.getClassLoader().getResourceAsStream("kustvakt.conf");
+        }
+        else{
+            in = new FileInputStream(f);
         }
         
-        Properties properties = new Properties();
-        FileInputStream in = new FileInputStream(f);
         properties.load(in);
         in.close();
         fullConfig = new FullConfiguration(properties);

lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java

diff --git a/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java b/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
index 123c1d1..54e80f9 100644
--- a/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
+++ b/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 
@@ -18,15 +19,16 @@
         if (kargs == null) System.exit(0);
 
         File f = new File("kustvakt-lite.conf");
+        Properties properties = new Properties();
+        InputStream in = null;
+        
         if (!f.exists()){
-            URL url = KustvaktLiteServer.class.getClassLoader().getResource("kustvakt-lite.conf");
-            if (url!=null){
-                f = new File(url.toURI());
-            }
+            in = KustvaktLiteServer.class.getClassLoader().getResourceAsStream("kustvakt-lite.conf");
+        }
+        else{
+            in = new FileInputStream(f);
         }
         
-        Properties properties = new Properties();
-        FileInputStream in = new FileInputStream(f);
         properties.load(in);
         in.close();
         config = new KustvaktConfiguration(properties);