svn commit: r1685077 - /sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java

[bdelacretaz]

Author: bdelacretaz
Date: Fri Jun 12 12:22:15 2015
New Revision: 1685077

URL: http://svn.apache.org/r1685077
Log:
SLING-4728 - use settings from all features

Modified:
    
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java

Modified: 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java?rev=1685077&r1=1685076&r2=1685077&view=diff
==============================================================================
--- 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
 (original)
+++ 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/launcher/FrameworkSetup.java
 Fri Jun 12 12:22:15 2015
@@ -52,7 +52,7 @@ public class FrameworkSetup extends Hash
         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();