diff --git a/dmnverifierapi/src/main/resources/dict/adj.exc b/dict/adj.exc
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/adj.exc
rename to dict/adj.exc
diff --git a/dmnverifierapi/src/main/resources/dict/adv.exc b/dict/adv.exc
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/adv.exc
rename to dict/adv.exc
diff --git a/dmnverifierapi/src/main/resources/dict/cntlist b/dict/cntlist
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/cntlist
rename to dict/cntlist
diff --git a/dmnverifierapi/src/main/resources/dict/cntlist.rev b/dict/cntlist.rev
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/cntlist.rev
rename to dict/cntlist.rev
diff --git a/dmnverifierapi/src/main/resources/dict/cousin.exc b/dict/cousin.exc
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/cousin.exc
rename to dict/cousin.exc
diff --git a/dmnverifierapi/src/main/resources/dict/data.adj b/dict/data.adj
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/data.adj
rename to dict/data.adj
diff --git a/dmnverifierapi/src/main/resources/dict/data.adv b/dict/data.adv
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/data.adv
rename to dict/data.adv
diff --git a/dmnverifierapi/src/main/resources/dict/data.noun b/dict/data.noun
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/data.noun
rename to dict/data.noun
diff --git a/dmnverifierapi/src/main/resources/dict/data.verb b/dict/data.verb
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/data.verb
rename to dict/data.verb
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/adj.all b/dict/dbfiles/adj.all
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/adj.all
rename to dict/dbfiles/adj.all
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/adj.pert b/dict/dbfiles/adj.pert
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/adj.pert
rename to dict/dbfiles/adj.pert
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/adj.ppl b/dict/dbfiles/adj.ppl
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/adj.ppl
rename to dict/dbfiles/adj.ppl
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/adv.all b/dict/dbfiles/adv.all
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/adv.all
rename to dict/dbfiles/adv.all
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/cntlist b/dict/dbfiles/cntlist
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/cntlist
rename to dict/dbfiles/cntlist
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.Tops b/dict/dbfiles/noun.Tops
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.Tops
rename to dict/dbfiles/noun.Tops
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.act b/dict/dbfiles/noun.act
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.act
rename to dict/dbfiles/noun.act
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.animal b/dict/dbfiles/noun.animal
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.animal
rename to dict/dbfiles/noun.animal
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.artifact b/dict/dbfiles/noun.artifact
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.artifact
rename to dict/dbfiles/noun.artifact
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.attribute b/dict/dbfiles/noun.attribute
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.attribute
rename to dict/dbfiles/noun.attribute
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.body b/dict/dbfiles/noun.body
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.body
rename to dict/dbfiles/noun.body
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.cognition b/dict/dbfiles/noun.cognition
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.cognition
rename to dict/dbfiles/noun.cognition
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.communication b/dict/dbfiles/noun.communication
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.communication
rename to dict/dbfiles/noun.communication
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.event b/dict/dbfiles/noun.event
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.event
rename to dict/dbfiles/noun.event
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.feeling b/dict/dbfiles/noun.feeling
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.feeling
rename to dict/dbfiles/noun.feeling
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.food b/dict/dbfiles/noun.food
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.food
rename to dict/dbfiles/noun.food
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.group b/dict/dbfiles/noun.group
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.group
rename to dict/dbfiles/noun.group
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.location b/dict/dbfiles/noun.location
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.location
rename to dict/dbfiles/noun.location
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.motive b/dict/dbfiles/noun.motive
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.motive
rename to dict/dbfiles/noun.motive
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.object b/dict/dbfiles/noun.object
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.object
rename to dict/dbfiles/noun.object
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.person b/dict/dbfiles/noun.person
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.person
rename to dict/dbfiles/noun.person
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.phenomenon b/dict/dbfiles/noun.phenomenon
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.phenomenon
rename to dict/dbfiles/noun.phenomenon
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.plant b/dict/dbfiles/noun.plant
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.plant
rename to dict/dbfiles/noun.plant
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.possession b/dict/dbfiles/noun.possession
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.possession
rename to dict/dbfiles/noun.possession
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.process b/dict/dbfiles/noun.process
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.process
rename to dict/dbfiles/noun.process
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.quantity b/dict/dbfiles/noun.quantity
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.quantity
rename to dict/dbfiles/noun.quantity
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.relation b/dict/dbfiles/noun.relation
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.relation
rename to dict/dbfiles/noun.relation
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.shape b/dict/dbfiles/noun.shape
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.shape
rename to dict/dbfiles/noun.shape
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.state b/dict/dbfiles/noun.state
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.state
rename to dict/dbfiles/noun.state
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.substance b/dict/dbfiles/noun.substance
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.substance
rename to dict/dbfiles/noun.substance
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/noun.time b/dict/dbfiles/noun.time
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/noun.time
rename to dict/dbfiles/noun.time
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.Framestext b/dict/dbfiles/verb.Framestext
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.Framestext
rename to dict/dbfiles/verb.Framestext
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.body b/dict/dbfiles/verb.body
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.body
rename to dict/dbfiles/verb.body
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.change b/dict/dbfiles/verb.change
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.change
rename to dict/dbfiles/verb.change
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.cognition b/dict/dbfiles/verb.cognition
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.cognition
rename to dict/dbfiles/verb.cognition
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.communication b/dict/dbfiles/verb.communication
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.communication
rename to dict/dbfiles/verb.communication
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.competition b/dict/dbfiles/verb.competition
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.competition
rename to dict/dbfiles/verb.competition
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.consumption b/dict/dbfiles/verb.consumption
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.consumption
rename to dict/dbfiles/verb.consumption
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.contact b/dict/dbfiles/verb.contact
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.contact
rename to dict/dbfiles/verb.contact
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.creation b/dict/dbfiles/verb.creation
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.creation
rename to dict/dbfiles/verb.creation
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.emotion b/dict/dbfiles/verb.emotion
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.emotion
rename to dict/dbfiles/verb.emotion
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.motion b/dict/dbfiles/verb.motion
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.motion
rename to dict/dbfiles/verb.motion
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.perception b/dict/dbfiles/verb.perception
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.perception
rename to dict/dbfiles/verb.perception
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.possession b/dict/dbfiles/verb.possession
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.possession
rename to dict/dbfiles/verb.possession
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.social b/dict/dbfiles/verb.social
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.social
rename to dict/dbfiles/verb.social
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.stative b/dict/dbfiles/verb.stative
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.stative
rename to dict/dbfiles/verb.stative
diff --git a/dmnverifierapi/src/main/resources/dict/dbfiles/verb.weather b/dict/dbfiles/verb.weather
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/dbfiles/verb.weather
rename to dict/dbfiles/verb.weather
diff --git a/dmnverifierapi/src/main/resources/dict/index.adj b/dict/index.adj
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/index.adj
rename to dict/index.adj
diff --git a/dmnverifierapi/src/main/resources/dict/index.adv b/dict/index.adv
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/index.adv
rename to dict/index.adv
diff --git a/dmnverifierapi/src/main/resources/dict/index.noun b/dict/index.noun
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/index.noun
rename to dict/index.noun
diff --git a/dmnverifierapi/src/main/resources/dict/index.sense b/dict/index.sense
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/index.sense
rename to dict/index.sense
diff --git a/dmnverifierapi/src/main/resources/dict/index.verb b/dict/index.verb
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/index.verb
rename to dict/index.verb
diff --git a/dmnverifierapi/src/main/resources/dict/log.grind.3.1 b/dict/log.grind.3.1
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/log.grind.3.1
rename to dict/log.grind.3.1
diff --git a/dmnverifierapi/src/main/resources/dict/noun.exc b/dict/noun.exc
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/noun.exc
rename to dict/noun.exc
diff --git a/dmnverifierapi/src/main/resources/dict/sentidx.vrb b/dict/sentidx.vrb
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/sentidx.vrb
rename to dict/sentidx.vrb
diff --git a/dmnverifierapi/src/main/resources/dict/sents.vrb b/dict/sents.vrb
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/sents.vrb
rename to dict/sents.vrb
diff --git a/dmnverifierapi/src/main/resources/dict/verb.Framestext b/dict/verb.Framestext
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/verb.Framestext
rename to dict/verb.Framestext
diff --git a/dmnverifierapi/src/main/resources/dict/verb.exc b/dict/verb.exc
similarity index 100%
rename from dmnverifierapi/src/main/resources/dict/verb.exc
rename to dict/verb.exc
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/AppLifecycleBean.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/AppLifecycleBean.java
index 0f5cfe1b086c5ede00c3023b734ff81387c31f99..0cbbb5d8509851479dab0a2c90fdfc8d9f62ff0e 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/AppLifecycleBean.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/api/AppLifecycleBean.java
@@ -1,24 +1,32 @@
package de.unikoblenz.fgbks.api;
+import de.unikoblenz.fgbks.base.wordnet.WordnetService;
import de.unikoblenz.fgbks.core.dmn.verification.DmnVerificationService;
import io.quarkus.runtime.ShutdownEvent;
import io.quarkus.runtime.StartupEvent;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.inject.Inject;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ApplicationScoped
public class AppLifecycleBean {
- private static final Logger LOGGER = LoggerFactory.getLogger("AppLifecycle");
-
@Inject
DmnVerificationService dmnVerificationService;
+ private static final Logger LOGGER = LoggerFactory.getLogger("AppLifecycle");
+ @ConfigProperty(name = "wordnet.path")
+ private String wordnetPath;
+
void onStart(@Observes StartupEvent ev) {
LOGGER.info("The dmn verification application is starting...");
+ // Init wordnet
+ LOGGER.info("Starting initialization of wordnet...");
+ WordnetService.getInstance(true, wordnetPath);
+ LOGGER.info("Starting initialization of verifier...");
dmnVerificationService.initVerifier();
}
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/wordnet/WordnetService.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/wordnet/WordnetService.java
index 6865bd64a8b65f37d0f6450dc4afc3226b1336ed..638643b71c3a7689738eeea324fe68abf0980137 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/wordnet/WordnetService.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/base/wordnet/WordnetService.java
@@ -7,7 +7,6 @@ import edu.mit.jwi.item.ISynset;
import edu.mit.jwi.item.IWord;
import edu.mit.jwi.item.IWordID;
import edu.mit.jwi.item.POS;
-import java.io.File;
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
@@ -20,14 +19,13 @@ import java.util.Set;
*/
public final class WordnetService implements WordnetServiceFunctions {
- private static final String PATH_WORDNET = "dict/";
// Singleton pattern
private static WordnetService instance;
private IDictionary dictionary;
- private WordnetService() {
- setupDictionary();
+ private WordnetService(String path) {
+ setupDictionary(path);
}
/**
@@ -36,11 +34,11 @@ public final class WordnetService implements WordnetServiceFunctions {
* @param refresh true for a new initialisation of wordnet
* @return the wordnet service instance
*/
- public static WordnetService getInstance(boolean refresh) {
+ public static WordnetService getInstance(boolean refresh, String path) {
if (instance == null) {
- instance = new WordnetService();
+ instance = new WordnetService(path);
} else if (refresh) {
- instance.setupDictionary();
+ instance.setupDictionary(path);
}
return instance;
}
@@ -51,21 +49,19 @@ public final class WordnetService implements WordnetServiceFunctions {
* @return the wordnet service instance
*/
public static WordnetService getInstance() {
- return getInstance(false);
+ return getInstance(false, null);
}
- private void setupDictionary() {
+ private void setupDictionary(String path) {
if (dictionary != null) {
dictionary.close();
}
dictionary = null;
try {
- String totalPath =
- new File(getClass().getClassLoader().getResource(PATH_WORDNET).getFile())
- .getAbsolutePath();
- dictionary = new Dictionary(new URL("file", null, totalPath));
+ dictionary = new Dictionary(new URL("file", null, path));
dictionary.open();
} catch (Exception e) {
+ e.printStackTrace();
dictionary = null;
}
}
diff --git a/dmnverifierapi/src/main/resources/application.properties b/dmnverifierapi/src/main/resources/application.properties
index edf2982dad7df27af650d5837f62c75a3c36b63e..79b991724cb23ca75f085819d9e17e76291bc4ad 100644
--- a/dmnverifierapi/src/main/resources/application.properties
+++ b/dmnverifierapi/src/main/resources/application.properties
@@ -15,3 +15,6 @@ verifier.package=de.unikoblenz.fgbks.core.dmn.verification.verifier
quarkus.log.console.color=false
quarkus.log.console.level=INFO
%dev.quarkus.log.console.level=DEBUG
+# Path to wordnet
+%dev.wordnet.path=C:\\Users\\jonas\\IdeaProjects\\ma-jonasblatt-dmn-verifier\\dict
+wordnet.path=/home/ubuntu/wordnet/dict