change all file paths to relative or absolute paths

1 files changed, 11 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
index 0aeed8cb5..caed3e469 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
@@ -27,6 +27,7 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
@@ -48,6 +49,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
+import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class MailHelper {
@@ -67,7 +69,7 @@ public class MailHelper {
 		ConfigurationProvider config = ConfigurationProvider.getInstance();
 		String templateurl = config.getMailUserAcountVerificationTemplate();
 		
-		String template = readTemplateFromURL(templateurl);
+		String template = readTemplateFromURL(templateurl, config.getConfigRootDir());
 		
 		if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
 			template = template.replace(PATTERN_GIVENNAME, userdb.getInstitut());
@@ -100,7 +102,7 @@ public class MailHelper {
 		ConfigurationProvider config = ConfigurationProvider.getInstance();
 		String templateurl = config.getMailAdminTemplate();
 		
-		String template = readTemplateFromURL(templateurl);
+		String template = readTemplateFromURL(templateurl, config.getConfigRootDir());
 		template = template.replace(PATTERN_OPENOAS, String.valueOf(numOpenOAs));
 		template = template.replace(PATTERN_OPENUSERS, String.valueOf(numOpenUsers));
 		
@@ -115,7 +117,7 @@ public class MailHelper {
 		ConfigurationProvider config = ConfigurationProvider.getInstance();
 		String templateurl = config.getMailUserAcountActivationTemplate();
 		
-		String template = readTemplateFromURL(templateurl);
+		String template = readTemplateFromURL(templateurl, config.getConfigRootDir());
 		if (MiscUtil.isNotEmpty(institut)) {
 			template = template.replace(PATTERN_GIVENNAME, institut);
 			template = template.replace(PATTERN_FAMILYNAME, "");
@@ -143,7 +145,7 @@ public class MailHelper {
 		ConfigurationProvider config = ConfigurationProvider.getInstance();
 		String templateurl = config.getMailOAActivationTemplate();
 		
-		String template = readTemplateFromURL(templateurl);
+		String template = readTemplateFromURL(templateurl, config.getConfigRootDir());
 		if (MiscUtil.isNotEmpty(institut)) {
 			template = template.replace(PATTERN_GIVENNAME, institut);
 			template = template.replace(PATTERN_FAMILYNAME, "");
@@ -172,7 +174,7 @@ public class MailHelper {
 		ConfigurationProvider config = ConfigurationProvider.getInstance();
 		String templateurl = config.getMailUserAcountRevocationTemplate();
 		
-		String template = readTemplateFromURL(templateurl);
+		String template = readTemplateFromURL(templateurl, config.getConfigRootDir());
 		
 		if (userdb.isIsMandateUser() != null && userdb.isIsMandateUser()) {
 			template = template.replace(PATTERN_GIVENNAME, userdb.getInstitut());
@@ -190,11 +192,12 @@ public class MailHelper {
 				userdb.getMail(), template);
 	}
 	
-	private static String readTemplateFromURL(String templateurl) throws ConfigurationException {
+	private static String readTemplateFromURL(String templateurl, String rootDir) throws ConfigurationException {
 		InputStream input;
 		try {
-			File file = new File(templateurl);
-			input = new  FileInputStream(file);
+						
+			URL keystoreURL = new URL(FileUtils.makeAbsoluteURL(templateurl, rootDir));
+			input = keystoreURL.openStream();
 			StringWriter writer = new StringWriter();
 			IOUtils.copy(input, writer);
 			input.close();