Merge pull request #462 from jfdenise/WFMP-236

Fix for WFMP-236, The generated configuration name is not used when WildFly Glow is enabled
wildfly · Jan 5, 2024 · 8e2355f · 8e2355f
2 parents dba73a6 + 4ee816f
commit 8e2355f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/plugin/src/main/java/org/wildfly/plugin/common/Utils.java b/plugin/src/main/java/org/wildfly/plugin/common/Utils.java
@@ -134,7 +134,8 @@ public static ScanResults scanDeployment(GlowConfig discoverProvisioningInfo,
                 p.storeProvisioningConfig(in, inProvisioningFile);
             }
         }
-        Arguments arguments = discoverProvisioningInfo.toArguments(deploymentContent, inProvisioningFile);
+        Arguments arguments = discoverProvisioningInfo.toArguments(deploymentContent, inProvisioningFile,
+                layersConfigurationFileName);
         log.info("Glow is scanning... ");
         ScanResults results;
         GlowMavenMessageWriter writer = new GlowMavenMessageWriter(log);

diff --git a/plugin/src/main/java/org/wildfly/plugin/provision/GlowConfig.java b/plugin/src/main/java/org/wildfly/plugin/provision/GlowConfig.java
@@ -32,7 +32,7 @@ public class GlowConfig {
     public GlowConfig() {
     }
 
-    public Arguments toArguments(Path deployment, Path inProvisioning) {
+    public Arguments toArguments(Path deployment, Path inProvisioning, String layersConfigurationFileName) {
         final Set<String> profiles = profile != null ? Set.of(profile) : Set.of();
         List<Path> lst = List.of(deployment);
         Builder builder = Arguments.scanBuilder().setExecutionContext(context).setExecutionProfiles(profiles)
@@ -44,6 +44,9 @@ public Arguments toArguments(Path deployment, Path inProvisioning) {
         if (inProvisioning != null) {
             builder.setProvisoningXML(inProvisioning);
         }
+        if (layersConfigurationFileName != null) {
+            builder.setConfigName(layersConfigurationFileName);
+        }
         return builder.build();
     }