commit bc55c75ba9d8cb9f7c5101c9d22af04c7b3782d8
author Muzaffar Nrm <muzaffar.nurmukhammadov@cybercon.de> Thu Feb 25 12:42:23 2021 +0100
committer Muzaffar Nrm <muzaffar.nurmukhammadov@cybercon.de> Thu Feb 25 12:42:23 2021 +0100
tree 9d710d8dc4ea83203ac0615ddf013b45352af665
parent 60e5c011c10592cff8e9f5cb2fbbcff459cfef76

Set Sling properties before processing the feature

src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java

diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java b/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
index 5cbb0b1..2008940 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/Bootstrap.java
@@ -73,10 +73,25 @@
         this.config.getVariables().put("sling.home", this.config.getHomeDirectory().getAbsolutePath());
         if (this.config.getVariables().get("repository.home") == null) {
             this.config.getVariables().put("repository.home",
-                this.config.getHomeDirectory().getAbsolutePath() + File.separatorChar + "repository");
+                    this.config.getHomeDirectory().getAbsolutePath() + File.separatorChar + "repository");
         }
         this.config.getVariables().put("sling.launchpad",
-            this.config.getHomeDirectory().getAbsolutePath() + "/launchpad");
+                this.config.getHomeDirectory().getAbsolutePath() + "/launchpad");
+
+        final Installation installation = this.config.getInstallation();
+        installation.setLogger(this.logger);
+
+        // set sling home, and use separate locations for launchpad and properties
+        installation.getFrameworkProperties().put("sling.home", this.config.getHomeDirectory().getAbsolutePath());
+        installation.getFrameworkProperties().put("sling.launchpad",
+                this.config.getHomeDirectory().getAbsolutePath() + "/launchpad");
+        if (!installation.getFrameworkProperties().containsKey("repository.home")) {
+            installation.getFrameworkProperties().put("repository.home",
+                    this.config.getHomeDirectory().getAbsolutePath() + File.separatorChar + "repository");
+        }
+        installation.getFrameworkProperties().put("sling.properties", "conf/sling.properties");
+        installation.getFrameworkProperties().put("sling.feature",
+                getApplicationFeatureFile(this.config).toURI().toString());
     }
 
     public void run() {
@@ -229,7 +244,6 @@
         this.logger.info("");
 
         final Installation installation = config.getInstallation();
-        installation.setLogger(this.logger);
 
         // set sling home, and use separate locations for launchpad and properties
         installation.getFrameworkProperties().put("sling.home", config.getHomeDirectory().getAbsolutePath());