Loading of configuration files works now also while packaging AGDISTI…

…S to a war
dice-group · Sep 18, 2014 · 2267bef · 2267bef
1 parent e086a2e
commit 2267bef
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 32 deletions.
diff --git a/src/main/java/org/aksw/agdistis/algorithm/CandidateUtil.java b/src/main/java/org/aksw/agdistis/algorithm/CandidateUtil.java
@@ -1,6 +1,5 @@
 package org.aksw.agdistis.algorithm;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -32,7 +31,7 @@ public class CandidateUtil {
 
 	public CandidateUtil() throws IOException {
 		Properties prop = new Properties();
-		InputStream input = new FileInputStream("config/agdistis.properties");
+		InputStream input = CandidateUtil.class.getResourceAsStream("/config/agdistis.properties");
 		prop.load(input);
 
 		this.nodeType = prop.getProperty("nodeType");

diff --git a/src/main/java/org/aksw/agdistis/algorithm/CorporationAffixCleaner.java b/src/main/java/org/aksw/agdistis/algorithm/CorporationAffixCleaner.java
@@ -1,10 +1,9 @@
 package org.aksw.agdistis.algorithm;
 
 import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.Properties;
 
@@ -14,15 +13,15 @@ public class CorporationAffixCleaner {
 
 	public CorporationAffixCleaner() throws IOException {
 		Properties prop = new Properties();
-		InputStream input = new FileInputStream("config/agdistis.properties");
+		InputStream input = CorporationAffixCleaner.class.getResourceAsStream("/config/agdistis.properties");
 		prop.load(input);
 		String file = prop.getProperty("corporationAffixes");
 
 		loadCorporationAffixes(file);
 	}
 
 	private void loadCorporationAffixes(String file) throws IOException {
-		BufferedReader br = new BufferedReader(new FileReader(file));
+		BufferedReader br = new BufferedReader(new InputStreamReader(CorporationAffixCleaner.class.getResourceAsStream(file)));
 		while (br.ready()) {
 			String line = br.readLine();
 			corporationAffixes.add(line);

diff --git a/src/main/java/org/aksw/agdistis/algorithm/DomainWhiteLister.java b/src/main/java/org/aksw/agdistis/algorithm/DomainWhiteLister.java
@@ -1,10 +1,9 @@
 package org.aksw.agdistis.algorithm;
 
 import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -18,7 +17,7 @@ public class DomainWhiteLister {
 
 	public DomainWhiteLister(TripleIndex index) throws IOException {
 		Properties prop = new Properties();
-		InputStream input = new FileInputStream("config/agdistis.properties");
+		InputStream input =DomainWhiteLister.class.getResourceAsStream("/config/agdistis.properties");
 		prop.load(input);
 		String file = prop.getProperty("whiteList");
 
@@ -28,7 +27,7 @@ public DomainWhiteLister(TripleIndex index) throws IOException {
 	}
 
 	private void loadWhiteDomains(String file) throws IOException {
-		BufferedReader br = new BufferedReader(new FileReader(file));
+		BufferedReader br = new BufferedReader(new InputStreamReader(DomainWhiteLister.class.getResourceAsStream(file)));
 		while (br.ready()) {
 			String line = br.readLine();
 			whiteList.add(line);

diff --git a/src/main/java/org/aksw/agdistis/algorithm/NEDAlgo_HITS.java b/src/main/java/org/aksw/agdistis/algorithm/NEDAlgo_HITS.java
@@ -1,6 +1,5 @@
 package org.aksw.agdistis.algorithm;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -36,7 +35,7 @@ public class NEDAlgo_HITS {
 
 	public NEDAlgo_HITS() throws IOException {
 		Properties prop = new Properties();
-		InputStream input = new FileInputStream("config/agdistis.properties");
+		InputStream input = NEDAlgo_HITS.class.getResourceAsStream("/config/agdistis.properties");
 		prop.load(input);
 
 		String nodeType = prop.getProperty("nodeType");

diff --git a/src/main/java/org/aksw/agdistis/util/TripleIndex.java b/src/main/java/org/aksw/agdistis/util/TripleIndex.java
@@ -1,7 +1,6 @@
 package org.aksw.agdistis.util;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -45,17 +44,17 @@ public class TripleIndex {
 	private UrlValidator urlValidator;
 
 	public TripleIndex() throws IOException {
-			Properties prop = new Properties();
-			InputStream input = new FileInputStream("config/agdistis.properties");
-			prop.load(input);
+		Properties prop = new Properties();
+		InputStream input = TripleIndex.class.getResourceAsStream("/config/agdistis.properties");
+		prop.load(input);
 
-			String index = prop.getProperty("index");
-			log.info("The index will be here: " + index);
+		String index = prop.getProperty("index");
+		log.info("The index will be here: " + index);
 
-			directory = new MMapDirectory(new File(index));
-			ireader = DirectoryReader.open(directory);
-			isearcher = new IndexSearcher(ireader);
-			this.urlValidator = new UrlValidator();
+		directory = new MMapDirectory(new File(index));
+		ireader = DirectoryReader.open(directory);
+		isearcher = new IndexSearcher(ireader);
+		this.urlValidator = new UrlValidator();
 	}
 
 	public List<Triple> search(String subject, String predicate, String object) {
@@ -115,8 +114,8 @@ public List<Triple> search(String subject, String predicate, String object, int
 	}
 
 	public void close() throws IOException {
-			ireader.close();
-			directory.close();
+		ireader.close();
+		directory.close();
 	}
 
 	public DirectoryReader getIreader() {

diff --git a/config/agdistis.de.properties → ...n/resources/config/agdistis.de.properties b/config/agdistis.de.properties → ...n/resources/config/agdistis.de.properties
@@ -15,8 +15,8 @@ threshholdTrigram=0.82
 #heuristicExpansionOn explains whether simple coocurence resolution is done or not, e.g., Barack => Barack Obama if both are in the same text
 heuristicExpansionOn=false
 #list of entity domains and corporationAffixes
-whiteList=config/whiteList.txt
-corporationAffixes=config/corporationAffixes.txt
+whiteList=/config/whiteList.txt
+corporationAffixes=/config/corporationAffixes.txt
 
 # IMPORTANT for creating an own index
 folderWithTTLFiles=/data/r.usbeck/DBpedia/2014_de

diff --git a/config/agdistis.en.properties → ...n/resources/config/agdistis.en.properties b/config/agdistis.en.properties → ...n/resources/config/agdistis.en.properties
@@ -15,8 +15,8 @@ threshholdTrigram=0.82
 #heuristicExpansionOn explains whether simple coocurence resolution is done or not, e.g., Barack => Barack Obama if both are in the same text
 heuristicExpansionOn=false
 #list of entity domains and corporationAffixes
-whiteList=config/whiteList.txt
-corporationAffixes=config/corporationAffixes.txt
+whiteList=/config/whiteList.txt
+corporationAffixes=/config/corporationAffixes.txt
 
 # IMPORTANT for creating an own index
 folderWithTTLFiles=/data/r.usbeck/DBpedia/2014_en

diff --git a/config/agdistis.properties → ...main/resources/config/agdistis.properties b/config/agdistis.properties → ...main/resources/config/agdistis.properties
@@ -15,8 +15,8 @@ threshholdTrigram=0.82
 #heuristicExpansionOn explains whether simple coocurence resolution is done or not, e.g., Barack => Barack Obama if both are in the same text
 heuristicExpansionOn=false
 #list of entity domains and corporationAffixes
-whiteList=config/whiteList.txt
-corporationAffixes=config/corporationAffixes.txt
+whiteList=/config/whiteList.txt
+corporationAffixes=/config/corporationAffixes.txt
 
 # IMPORTANT for creating an own index
 folderWithTTLFiles=/data/r.usbeck/DBpedia/2014_en

diff --git a/config/agdistis.zh.properties → ...n/resources/config/agdistis.zh.properties b/config/agdistis.zh.properties → ...n/resources/config/agdistis.zh.properties
@@ -15,8 +15,8 @@ threshholdTrigram=0.82
 #heuristicExpansionOn explains whether simple coocurence resolution is done or not, e.g., Barack => Barack Obama if both are in the same text
 heuristicExpansionOn=false
 #list of entity domains and corporationAffixes
-whiteList=config/whiteList.txt
-corporationAffixes=config/corporationAffixes.txt
+whiteList=/config/whiteList.txt
+corporationAffixes=/config/corporationAffixes.txt
 
 # IMPORTANT for creating an own index
 folderWithTTLFiles=/data/r.usbeck/DBpedia/2014_zh

diff --git a/config/corporationAffixes.txt → ...n/resources/config/corporationAffixes.txt b/config/corporationAffixes.txt → ...n/resources/config/corporationAffixes.txt
diff --git a/config/whiteList.txt → src/main/resources/config/whiteList.txt b/config/whiteList.txt → src/main/resources/config/whiteList.txt
diff --git a/config/whiteListYago.txt → src/main/resources/config/whiteListYago.txt b/config/whiteListYago.txt → src/main/resources/config/whiteListYago.txt