[sling-org-apache-sling-kickstart] branch master updated: SLING-9761 - Handed the -D properties over to the Feature Launcher

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-kickstart.git


The following commit(s) were added to refs/heads/master by this push:
     new 637b76c  SLING-9761 - Handed the -D properties over to the Feature Launcher
637b76c is described below

commit 637b76ce5d7e8098349ff309912931c8fc4c9e08
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Tue Sep 22 14:33:29 2020 -0700

    SLING-9761 - Handed the -D properties over to the Feature Launcher
---
 src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java
index 44c8197..d71b509 100644
--- a/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java
+++ b/src/main/java/org/apache/sling/kickstart/app/KickstartStarter.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.sling.feature.launcher.impl.Main;
@@ -214,6 +215,11 @@ public class KickstartStarter implements Runnable, ControlTarget {
             if(verbose) {
                 argumentList.add("-v");
             }
+            if(properties != null) {
+                for(Entry<String, String> entry: properties.entrySet()) {
+                    addArgument(argumentList, entry.getKey(), entry.getValue());
+                }
+            }
             System.out.println("Before Launching Feature Launcher, arguments: " + argumentList);
             // Now we have to handle any Start Option
             ControlAction controlAction = getControlAction(command);