devonfw#1696: fixed jar handling

added extra condition for jar handling to TemplateSetReader constructor
jan-vcapgemini · Aug 10, 2023 · 07599a9 · 07599a9
1 parent 60bbd58
commit 07599a9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/.../cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetReader.java b/.../cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetReader.java
@@ -10,6 +10,7 @@
 import com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration;
 import com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration;
 import com.devonfw.cobigen.impl.config.entity.io.TemplatesConfiguration;
+import com.devonfw.cobigen.impl.util.FileSystemUtil;
 
 /**
  * The {@link TemplateSetReader} combines everything from the {@link TemplatesConfigurationReader} and
@@ -44,8 +45,15 @@ public class TemplateSetReader extends JaxbDeserializer {
 
   public TemplateSetReader(Path rootDir, ConfigurationReader configurationReader) {
 
-    this.templateSetFile = rootDir.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
-        .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+    if (rootDir.toString().endsWith(".jar")) {
+      this.templateSetFile = FileSystemUtil.createFileSystemDependentPath(rootDir.toUri())
+          .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+    } else {
+      this.templateSetFile = FileSystemUtil.createFileSystemDependentPath(rootDir.toUri())
+          .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
+          .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+    }
+
     this.configurationReader = configurationReader;
     deserializeConfigFile();
   }