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 2012/04/24 16:51:45 UTC
svn commit: r1329761 - in /karaf/trunk/dev/core: pom.xml
src/main/resources/OSGI-INF/blueprint/blueprint.xml
Author: jbonofre
Date: Tue Apr 24 14:51:45 2012
New Revision: 1329761
URL: http://svn.apache.org/viewvc?rev=1329761&view=rev
Log:
[KARAF-1383] Fix build warning messages in dev core module
Modified:
karaf/trunk/dev/core/pom.xml
karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: karaf/trunk/dev/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/core/pom.xml?rev=1329761&r1=1329760&r2=1329761&view=diff
==============================================================================
--- karaf/trunk/dev/core/pom.xml (original)
+++ karaf/trunk/dev/core/pom.xml Tue Apr 24 14:51:45 2012
@@ -88,10 +88,9 @@
</Export-Package>
<Private-Package>
org.apache.karaf.dev.core.internal,
- org.apache.felix.utils.properties
org.apache.felix.utils.manifest,
org.apache.felix.utils.version,
- org.apache.felix.utils.properties,
+ org.apache.felix.utils.properties
</Private-Package>
</instructions>
</configuration>
Modified: karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1329761&r1=1329760&r2=1329761&view=diff
==============================================================================
--- karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/dev/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Apr 24 14:51:45 2012
@@ -13,10 +13,9 @@
limitations under the License.
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
- <ext:property-placeholder />
+ <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
<reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
<reference id="packageAdmin" interface="org.osgi.service.packageadmin.PackageAdmin"/>
@@ -39,9 +38,10 @@
<argument ref="devService" />
</bean>
- <service ref="devMBean" interface="org.apache.karaf.dev.core.DevMBean">
+ <service ref="devMBean" auto-export="interfaces">
<service-properties>
- <entry key="jmx.objectname" value="org.apache.karaf:type=dev,name=${karaf.name}"/>
+ <entry key="jmx.objectname" value="org.apache.karaf:type=dev,name=$[karaf.name]"/>
</service-properties>
</service>
+
</blueprint>