diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java index cd7e9f0990..a7287cbb98 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java @@ -88,13 +88,6 @@ public class JavaProject implements Serializable { * @return The base directory for the project. */ private File baseDirectory; - /** - * Project's resources directory - * - * @param resourcesDirectory resources directory where project resources look for. - * @return The resources directory for the project. - */ - private File resourcesDirectory; /** * Directory where all build files are located (e.g. target) * @@ -308,7 +301,6 @@ public JavaProject( this.scmTag = scmTag; this.buildPackageDirectory = buildPackageDirectory; this.maintainers = maintainers; - this.resourcesDirectory = baseDirectory != null ? new File(baseDirectory.getAbsolutePath() + "/src/main/resources") : new File("src/main/resources"); } } diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java index d082ae0eeb..3174ba635a 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java @@ -20,6 +20,8 @@ import lombok.Getter; import lombok.Setter; +// This class expends Properties class +// with URL of properties file path. public class PropertiesExtender extends Properties { @Getter @Setter diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/JKubeProjectUtil.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/JKubeProjectUtil.java index d17edb6d26..b83df01692 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/JKubeProjectUtil.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/JKubeProjectUtil.java @@ -175,8 +175,7 @@ public static String createDefaultResourceName(String artifactId, String ... suf public static URLClassLoader getClassLoader(JavaProject jKubeProject) { return ClassUtil.createClassLoader( jKubeProject.getCompileClassPathElements(), - jKubeProject.getOutputDirectory().getAbsolutePath(), - jKubeProject.getResourcesDirectory().getAbsolutePath()); + jKubeProject.getOutputDirectory().getAbsolutePath()); } public static String getProperty(String key, JavaProject project) { diff --git a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java index 27093ec397..39157955b5 100644 --- a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java +++ b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.net.URL; import java.util.List; import java.util.Properties; import java.util.Set; @@ -102,7 +103,12 @@ private List generateImages(List imageCo if (generator.isApplicable(ret)) { log.info("Running generator %s", generator.getName()); ret = generator.customize(ret, genCtx.isPrePackagePhase()); - log.info("The following properties file are used %s", genCtx.getProject().getPropertiesFile()); + URL propFileURL = genCtx.getProject().getPropertiesFile(); + if (propFileURL != null) { + log.info("The following properties file is used %s", propFileURL); + } else { + log.info("No properties file found"); + } } } return ret;