I'm not sure on this check in.
When I build trunk I get:
Failed tests:
testHandleFeatures(org.apache.karaf.instance.core.internal.InstanceServiceImplTest):
expected:<abc,def,test> but was:<abc,def,ssh,test>
Which can be resolved by updating
trunk/instance/core/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java
to include ssh in the expects assertion.
- assertEquals("abc,def,test", p2.get("featuresBoot"));
+ assertEquals("abc,def,ssh,test", p2.get("featuresBoot"));
That being said, is there a special reason for using
Collections.singletonList to add ssh? What if we want to add more to
the list down the road?
-Jamie
On Tue, May 15, 2012 at 9:06 AM, <[email protected]> wrote:
> 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");
>
>
