You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/04/23 15:47:09 UTC
svn commit: r767921 - in
/servicemix/smx4/kernel/trunk/gshell/gshell-features: pom.xml
src/main/resources/META-INF/spring/gshell-features.xml
Author: gertv
Date: Thu Apr 23 13:47:08 2009
New Revision: 767921
URL: http://svn.apache.org/viewvc?rev=767921&view=rev
Log:
SMX4KNL-268: FeaturesService throws exceptions when started before ConfigAdmin properties are available
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml?rev=767921&r1=767920&r2=767921&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml Thu Apr 23 13:47:08 2009
@@ -101,6 +101,7 @@
org.apache.geronimo.gshell.wisdom.command,
org.apache.servicemix.kernel.gshell.core,
org.apache.geronimo.gshell.wisdom.registry,
+ org.springframework.beans.factory.config,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml?rev=767921&r1=767920&r2=767921&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml Thu Apr 23 13:47:08 2009
@@ -39,6 +39,10 @@
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
<import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+
+ <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="file:${servicemix.home}/etc/org.apache.servicemix.features.cfg"/>
+ </bean>
<gshell:command-bundle>
<gshell:command name="features/addUrl">
@@ -112,7 +116,7 @@
<prop key="featuresBoot"></prop>
</osgix:cm-properties>
- <ctx:property-placeholder properties-ref="cmProps" />
+ <!-- <ctx:property-placeholder properties-ref="cmProps" /> -->
<osgi:reference id="mbeanServer"
interface="javax.management.MBeanServer"