commit 7c6ba0924c3995f811fded515cc06bcd6fb2c3aa
author Bertrand Delacretaz <bdelacretaz@apache.org> Fri Jun 12 12:22:15 2015 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Fri Jun 12 12:22:15 2015 +0000
tree 447a51172d84a6411f7e78059f8bb988acfaa6a2
parent 158606d373bbaed948873685040ea44b74d27b69

SLING-4728 - use settings from all features

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1685077 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java

diff --git a/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java b/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
index d01f08e..fc97225 100644
--- a/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
+++ b/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
@@ -52,7 +52,7 @@
         final Model model = require(Launcher.MODEL_KEY, Model.class);
         
         log.info("Setting OSGi framework properties");
-        final Map<String, String> fprops = new FrameworkProperties(model).getProperties(Launcher.ONLY_CRANKSTART_FILTER);
+        final Map<String, String> fprops = new FrameworkProperties(model).getProperties(null);
                 
         log.info("Starting the OSGi framework");
         final FrameworkFactory factory = (FrameworkFactory)getClass().getClassLoader().loadClass("org.apache.felix.framework.FrameworkFactory").newInstance();