svn commit: r1485746 - /karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

[anierbeck]

Author: anierbeck
Date: Thu May 23 14:51:04 2013
New Revision: 1485746

URL: http://svn.apache.org/r1485746
Log:
[KARAF-1549] - Child instance features cfg file looks weird

Modified:
    
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

Modified: 
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java?rev=1485746&r1=1485745&r2=1485746&view=diff
==============================================================================
--- 
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
 (original)
+++ 
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
 Thu May 23 14:51:04 2013
@@ -273,6 +273,8 @@ public class InstanceServiceImpl impleme
                 copyResourceToDir(karafBase, "etc/custom.properties", 
printOutput);
                 copyResourceToDir(karafBase, 
"etc/java.util.logging.properties", printOutput);
                 copyResourceToDir(karafBase, 
"etc/org.apache.felix.fileinstall-deploy.cfg", printOutput);
+                copyResourceToDir(karafBase, 
"etc/org.apache.karaf.features.obr.cfg", printOutput);
+                copyResourceToDir(karafBase, 
"etc/org.apache.karaf.features.repos.cfg", printOutput);
                 copyResourceToDir(karafBase, "etc/org.apache.karaf.log.cfg", 
printOutput);
                 copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", 
printOutput);
                 copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", 
printOutput);
@@ -336,6 +338,7 @@ public class InstanceServiceImpl impleme
         FileLockUtils.execute(featuresCfg, new 
FileLockUtils.RunnableWithProperties() {
             public void run(org.apache.felix.utils.properties.Properties 
properties) throws IOException {
                 appendToPropList(properties, "featuresBoot", 
Collections.singletonList("ssh"));
+                appendToPropList(properties, "featuresBoot", 
Collections.singletonList("framework"));
                 appendToPropList(properties, "featuresBoot", 
settings.getFeatures());
                 appendToPropList(properties, "featuresRepositories", 
settings.getFeatureURLs());
             }