You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/04/18 08:06:29 UTC

svn commit: r1469172 - in /karaf/branches/karaf-2.x: assemblies/apache-karaf/src/main/filtered-resources/etc/ main/src/main/resources/ main/src/test/resources/test-karaf-home/etc/ shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/

Author: jbonofre
Date: Thu Apr 18 06:06:29 2013
New Revision: 1469172

URL: http://svn.apache.org/r1469172
Log:
[KARAF-2273] Set Blueprint container as synchronous by default

Modified:
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
    karaf/branches/karaf-2.x/main/src/main/resources/config.properties
    karaf/branches/karaf-2.x/main/src/test/resources/test-karaf-home/etc/config.properties
    karaf/branches/karaf-2.x/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties?rev=1469172&r1=1469171&r2=1469172&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties Thu Apr 18 06:06:29 2013
@@ -118,5 +118,12 @@ eclipse.stateSaveDelayInterval = 1000
 #
 obr.repository.url = 
 
+#
+# Don't delay the console startup
+#
 karaf.delay.console=false
 
+#
+# Set the Blueprint container in synchronous mode to avoid dependencies startup issue
+#
+org.apache.aries.blueprint.synchronous=true

Modified: karaf/branches/karaf-2.x/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/main/src/main/resources/config.properties?rev=1469172&r1=1469171&r2=1469172&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/main/src/main/resources/config.properties (original)
+++ karaf/branches/karaf-2.x/main/src/main/resources/config.properties Thu Apr 18 06:06:29 2013
@@ -47,6 +47,8 @@ karaf.default.repository=system
 #list of directories containing bundles to be loaded by SMX
 #bundle.locations=
 
+org.apache.aries.blueprint.synchronous=true
+
 #
 # Java platform package export properties.
 #

Modified: karaf/branches/karaf-2.x/main/src/test/resources/test-karaf-home/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/main/src/test/resources/test-karaf-home/etc/config.properties?rev=1469172&r1=1469171&r2=1469172&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/main/src/test/resources/test-karaf-home/etc/config.properties (original)
+++ karaf/branches/karaf-2.x/main/src/test/resources/test-karaf-home/etc/config.properties Thu Apr 18 06:06:29 2013
@@ -41,3 +41,4 @@ karaf.startlevel.bundle=60
 karaf.name=root
 karaf.default.repository=system
 
+org.apache.aries.blueprint.synchronous=true

Modified: karaf/branches/karaf-2.x/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties?rev=1469172&r1=1469171&r2=1469172&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties (original)
+++ karaf/branches/karaf-2.x/shell/dev/src/test/resources/org/apache/karaf/shell/dev/framework/config.properties Thu Apr 18 06:06:29 2013
@@ -59,6 +59,8 @@ felix.fileinstall.filter = .*\\.cfg
 felix.fileinstall.poll   = 1000
 felix.fileinstall.noInitialDelay = true
 
+org.apache.aries.blueprint.synchronous=true
+
 #
 # Java platform package export properties.
 #