diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java index 9d53f645f..1e2d36e3b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ProductionConfigLoader.java @@ -74,16 +74,25 @@ public class ProductionConfigLoader implements ConfigLoader { String filePath = environment.getProperty("configuration.rda"); BufferedReader reader; List rdaList = new LinkedList<>(); - try { - reader = new BufferedReader(new FileReader(filePath)); - String line = reader.readLine(); - while (line != null) { - rdaList.add(line); - line = reader.readLine(); + for (int i = 0; i < 2; i++) { + try { + if (i == 0) { + reader = new BufferedReader(new FileReader(filePath)); + } else { + reader = new BufferedReader(new FileReader(getClass().getClassLoader().getResource(filePath).getFile())); + } + String line = reader.readLine(); + while (line != null) { + rdaList.add(line); + line = reader.readLine(); + } + reader.close(); + break; + } catch (IOException e) { + if (i == 1) { + logger.error(e.getMessage(), e); + } } - reader.close(); - } catch (IOException e) { - logger.error(e.getMessage(), e); } rdaProperties = rdaList; @@ -92,16 +101,25 @@ public class ProductionConfigLoader implements ConfigLoader { private void setDocument() { String filePath = environment.getProperty("configuration.h2020template"); InputStream is = null; - try { - is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); - this.document = new XWPFDocument(is); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } finally { + for (int i = 0; i < 2; i++) { try { - if (is != null) is.close(); + if (i == 0) { + is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); + } else { + is = getClass().getClassLoader().getResource(filePath).openStream(); + } + this.document = new XWPFDocument(is); + is.close(); + is = null; + break; } catch (IOException e) { - logger.warn("Warning: Could not close a stream after reading from file: " + filePath, e); + logger.error(e.getMessage(), e); + } finally { + try { + if (is != null) is.close(); + } catch (IOException e) { + logger.warn("Warning: Could not close a stream after reading from file: " + filePath, e); + } } } } @@ -113,11 +131,11 @@ public class ProductionConfigLoader implements ConfigLoader { File tempFile = new File(filePath); if (tempFile.exists()) { is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); - ObjectMapper objectMapper = new ObjectMapper(); - this.configurableProviders = objectMapper.readValue(is, ConfigurableProviders.class); } else { - this.configurableProviders = new ConfigurableProviders(); + is = getClass().getClassLoader().getResource(filePath).openStream(); } + ObjectMapper objectMapper = new ObjectMapper(); + this.configurableProviders = objectMapper.readValue(is, ConfigurableProviders.class); } catch (IOException e) { logger.error(e.getMessage(), e); } finally { @@ -179,6 +197,7 @@ public class ProductionConfigLoader implements ConfigLoader { InputStream is = null; Document doc; try { + System.out.println(filePath); is = new URL(Paths.get(filePath).toUri().toURL().toString()).openStream(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); diff --git a/dmp-backend/web/src/main/resources/config/application-staging.properties b/dmp-backend/web/src/main/resources/config/application-staging.properties index 4b92d0245..7dee84b05 100644 --- a/dmp-backend/web/src/main/resources/config/application-staging.properties +++ b/dmp-backend/web/src/main/resources/config/application-staging.properties @@ -19,9 +19,9 @@ pdf.converter.url=http://docsbox-web/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.rda=/tmp/RDACommonStandards.txt +configuration.rda=RDACommonStandards.txt configuration.h2020template=documents/h2020.docx -configuration.configurable_login_providers=/tmp/ConfigurableLoginProviders.json +configuration.configurable_login_providers=ConfigurableLoginProviders.json ####################INVITATION MAIL CONFIGURATIONS############## ####################GENERIC MAIL CONFIGURATIONS#################