Merge pull request OpenLiberty#913 from arunvenmany-ibm/multi_module_…

…war_issue_fix gradle multimodule war webapp src directory missing in ear.xml fixed
cherylking · Oct 9, 2024 · 2906113 · 2906113
2 parents e5df873 + bbb8e7b
commit 2906113
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/groovy/io/openliberty/tools/gradle/utils/LooseEarApplication.groovy b/src/main/groovy/io/openliberty/tools/gradle/utils/LooseEarApplication.groovy
@@ -49,6 +49,10 @@ public class LooseEarApplication extends LooseApplication {
 
     public Element addWarModule(Project proj) throws Exception {
         Element warArchive = config.addArchive("/" + proj.war.getArchiveFileName().get());
+        if (proj.war.getWebAppDirectory().getAsFile().get() != null) {
+            var sourceDir = new File(proj.war.getWebAppDirectory().getAsFile().get().getAbsolutePath())
+            config.addDir(warArchive,sourceDir,"/")
+        }
         proj.sourceSets.main.getOutput().getClassesDirs().each{config.addDir(warArchive, it, "/WEB-INF/classes");}
         addModules(warArchive,proj)
         return warArchive;