You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/07/16 13:15:47 UTC
svn commit: r964766 - in /karaf/trunk:
assembly/src/main/filtered-resources/etc/config.properties pom.xml
Author: gnodet
Date: Fri Jul 16 11:15:47 2010
New Revision: 964766
URL: http://svn.apache.org/viewvc?rev=964766&view=rev
Log:
KARAF-122: Webconsole login doesn't work with karaf.framework set to equinox
Modified:
karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=964766&r1=964765&r2=964766&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties Fri Jul 16 11:15:47 2010
@@ -79,6 +79,11 @@ felix.fileinstall.noInitialDelay = true
eclipse.stateSaveDelayInterval = 1000
#
+# equinox boot classloader configuration
+#
+osgi.parentClassloader = fwk
+
+#
# OBR Repository list
# This property will be modified by the obr:addUrl and obr:removeUrl commands.
#
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=964766&r1=964765&r2=964766&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Jul 16 11:15:47 2010
@@ -115,8 +115,8 @@
<felix.utils.version>1.0.0</felix.utils.version>
<felix.webconsole.version>3.1.0</felix.webconsole.version>
<felix.metatype.version>1.0.2</felix.metatype.version>
- <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
- <aries.jmx.version>0.1-incubating</aries.jmx.version>
+ <aries.blueprint.version>0.1-r964701</aries.blueprint.version>
+ <aries.jmx.version>0.1-r964701</aries.jmx.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<jansi.version>1.2</jansi.version>
<jetty.bundle.version>6.1.22_1</jetty.bundle.version>