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

[cschneider]

Author: cschneider
Date: Tue May 15 11:36:19 2012
New Revision: 1338657

URL: http://svn.apache.org/viewvc?rev=1338657&view=rev
Log:
KARAF-1206 Adding ssh feature so the instance starts correctly again

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=1338657&r1=1338656&r2=1338657&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
 Tue May 15 11:36:19 2012
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -233,7 +234,7 @@ public class InstanceServiceImpl impleme
 
     void addFeaturesFromSettings(File featuresCfg, InstanceSettings settings) 
throws IOException {
         Properties p = loadStorage(featuresCfg);
-
+        appendToPropList(p, "featuresBoot", Collections.singletonList("ssh"));
         appendToPropList(p, "featuresBoot", settings.getFeatures());
         appendToPropList(p, "featuresRepositories", settings.getFeatureURLs());
         saveStorage(p, featuresCfg, "Features Configuration");