This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7999c3d5edeb0824ba49ee5fb2721a5e0c42ddd4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 6 19:45:22 2016 +0200 Fix mapping resource, I don't get the fact that mapping was loaded from src/main/resources ? kind of strange to me) --- application-web/pom.xml | 15 --------------- .../web/controller/v1/ConfigurationController.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/application-web/pom.xml b/application-web/pom.xml index 6a991b3..8884738 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -167,21 +167,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>mapping</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <excludes> - <exclude>mapping</exclude> - </excludes> - </resource> - </resources> <plugins> diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java index 89228cc..353e7e8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java @@ -60,7 +60,7 @@ public class ConfigurationController extends ObserveWebMotionController { public RenderContent mapping() throws IOException { - try (InputStream mappingUrl = getClass().getResourceAsStream("/src/main/webmotion/mapping")) { + try (InputStream mappingUrl = getClass().getResourceAsStream("/mapping")) { String content = IOUtils.toString(mappingUrl); return toTextPlain(content); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.