svn commit: r1542295 - in /karaf/trunk: assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

[jb...@apache.org]

Author: jbonofre
Date: Fri Nov 15 15:40:26 2013
New Revision: 1542295

URL: http://svn.apache.org/r1542295
Log:
[KARAF-2573] Fix etc/org.apache.karaf.features.cfg file in the instances

Modified:
    karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
    karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg?rev=1542295&r1=1542294&r2=1542295&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg Fri Nov 15 15:40:26 2013
@@ -36,12 +36,12 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features,mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features,mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features,mvn:org.apache.karaf.features/spring/${project.version}/xml/features
 
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config
+featuresBoot=config,standard,region,package,kar,ssh,management
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)

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=1542295&r1=1542294&r2=1542295&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 Fri Nov 15 15:40:26 2013
@@ -278,7 +278,6 @@ public class InstanceServiceImpl impleme
                 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);
-//                copyResourceToDir(karafBase, "etc/startup.properties", printOutput);
                 copyResourceToDir(karafBase, "etc/users.properties", printOutput);
                 copyResourceToDir(karafBase, "etc/keys.properties", printOutput);
 
@@ -337,8 +336,6 @@ public class InstanceServiceImpl impleme
     void addFeaturesFromSettings(File featuresCfg, final InstanceSettings settings) throws IOException {
         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());
             }