Added data folder
containing super_client_info and database for mounting into docker
Change-Id: I2183d67cd3185f99f1ca4843ad26bd3aa5dcaf90
diff --git a/core/Changes b/core/Changes
index 19ccb7f..04ac2a9 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,5 +1,8 @@
# version 0.70
+- Added data folder containing super_client_info and database
+ for mounting into docker
+
# version 0.69.4
- Support token array in matchinfo (fixes #570; diewald)
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
index b020c9e..40073b8 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
@@ -38,6 +38,7 @@
public class KustvaktConfiguration {
public static final Map<String, Object> KUSTVAKT_USER = new HashMap<>();
+ public static final String DATA_FOLDER = "data";
private String vcInCaching;
@@ -120,7 +121,7 @@
public KustvaktConfiguration () {}
public void loadBasicProperties (Properties properties) {
- port = new Integer(properties.getProperty("server.port", "8095"));
+ port = Integer.valueOf(properties.getProperty("server.port", "8095"));
baseURL = properties.getProperty("kustvakt.base.url", "/api/*");
setSecureRandomAlgorithm(properties
.getProperty("security.secure.random.algorithm", ""));
@@ -151,8 +152,8 @@
}
this.supportedVersions.add(currentVersion);
- maxhits = new Integer(properties.getProperty("maxhits", "50000"));
- returnhits = new Integer(properties.getProperty("returnhits", "50000"));
+ maxhits = Integer.valueOf(properties.getProperty("maxhits", "50000"));
+ returnhits = Integer.valueOf(properties.getProperty("returnhits", "50000"));
indexDir = properties.getProperty("krill.indexDir", "");
// server options
diff --git a/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index d113e6e..172a22c 100644
--- a/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/core/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -43,6 +43,11 @@
public KustvaktBaseServer () {
rootPackages = "de.ids_mannheim.korap.web; "
+ "com.fasterxml.jackson.jaxrs.json;";
+
+ File d = new File(KustvaktConfiguration.DATA_FOLDER);
+ if (!d.exists()) {
+ d.mkdir();
+ }
}
protected KustvaktArgs readAttributes (String[] args) {