diff --git a/Dockerfile b/Dockerfile index 39d066f7..e7b4ccd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,6 @@ LABEL \ description="This image contains a sample application that displays the Java system properties and demonstrates MicroProfile Config, Health and Metrics." COPY --chown=1001:0 src/main/liberty/config/ /config/ -COPY --chown=1001:0 resources/ /output/resources/ RUN features.sh diff --git a/src/main/java/io/openliberty/sample/config/CustomConfigSource.java b/src/main/java/io/openliberty/sample/config/CustomConfigSource.java index 98791b97..da36408e 100644 --- a/src/main/java/io/openliberty/sample/config/CustomConfigSource.java +++ b/src/main/java/io/openliberty/sample/config/CustomConfigSource.java @@ -19,13 +19,14 @@ import java.io.StringReader; import java.io.BufferedReader; -import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.InputStream; + import org.eclipse.microprofile.config.spi.ConfigSource; public class CustomConfigSource implements ConfigSource { - String fileLocation = System.getProperty("user.dir").split("target")[0] - + "/resources/CustomConfigSource.json"; + String fileLocation = "META-INF/CustomConfigSource.json"; @Override public int getOrdinal() { @@ -83,7 +84,8 @@ public Map getProperties() { public String readFile(String fileName) { String result = ""; try { - BufferedReader br = new BufferedReader(new FileReader(fileName)); + InputStream is = this.getClass().getClassLoader().getResourceAsStream(fileName); + BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8")); StringBuilder sb = new StringBuilder(); String line = br.readLine(); while (line != null) { diff --git a/resources/CustomConfigSource.json b/src/main/webapp/META-INF/CustomConfigSource.json similarity index 99% rename from resources/CustomConfigSource.json rename to src/main/webapp/META-INF/CustomConfigSource.json index a24ca39e..12dc5dac 100644 --- a/resources/CustomConfigSource.json +++ b/src/main/webapp/META-INF/CustomConfigSource.json @@ -1 +1 @@ -{"config_ordinal":550,"io_openliberty_sample_system_inMaintenance":false,"io_openliberty_sample_testConfigOverwrite":"CustomSource"} +{"config_ordinal":550,"io_openliberty_sample_system_inMaintenance":false,"io_openliberty_sample_testConfigOverwrite":"CustomSource"}