From 89b15914e4e19b0e5dede2e0849ea3fc8cbe9d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Wed, 11 Jul 2018 09:43:45 +0200 Subject: [PATCH] Read resources relative to class (#10339) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- .../java/plain/server/generator/PlainJavaProjectGenerator.java | 3 +-- .../eclipse/che/plugin/java/plain/server/generator}/Main.java | 0 .../eclipse/che/plugin/java/plain/server/generator}/classpath | 0 .../eclipse/che/plugin/java/plain/server/generator}/project | 0 4 files changed, 1 insertion(+), 2 deletions(-) rename plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/{ => org/eclipse/che/plugin/java/plain/server/generator}/Main.java (100%) rename plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/{ => org/eclipse/che/plugin/java/plain/server/generator}/classpath (100%) rename plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/{ => org/eclipse/che/plugin/java/plain/server/generator}/project (100%) diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/java/org/eclipse/che/plugin/java/plain/server/generator/PlainJavaProjectGenerator.java b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/java/org/eclipse/che/plugin/java/plain/server/generator/PlainJavaProjectGenerator.java index 838b0b48c7..343f8ea176 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/java/org/eclipse/che/plugin/java/plain/server/generator/PlainJavaProjectGenerator.java +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/java/org/eclipse/che/plugin/java/plain/server/generator/PlainJavaProjectGenerator.java @@ -142,8 +142,7 @@ public class PlainJavaProjectGenerator implements CreateProjectHandler { } private String getResource(String resourceName) throws ServerException { - try (InputStream resourceAsStream = - getClass().getClassLoader().getResourceAsStream(resourceName)) { + try (InputStream resourceAsStream = getClass().getResourceAsStream(resourceName)) { return IOUtils.toString(resourceAsStream); } catch (Exception e) { throw new ServerException(e.getMessage()); diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/Main.java b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/Main.java similarity index 100% rename from plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/Main.java rename to plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/Main.java diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/classpath b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/classpath similarity index 100% rename from plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/classpath rename to plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/classpath diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/project b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/project similarity index 100% rename from plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/project rename to plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/main/resources/org/eclipse/che/plugin/java/plain/server/generator/project