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:52:55 UTC
svn commit: r1329768 - in /karaf/trunk/instance: command/pom.xml
core/pom.xml core/src/main/resources/OSGI-INF/blueprint/instance-core.xml
Author: jbonofre
Date: Tue Apr 24 14:52:55 2012
New Revision: 1329768
URL: http://svn.apache.org/viewvc?rev=1329768&view=rev
Log:
[KARAF-1383] Fix build warning messages in instance modules
Modified:
karaf/trunk/instance/command/pom.xml
karaf/trunk/instance/core/pom.xml
karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml
Modified: karaf/trunk/instance/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/command/pom.xml?rev=1329768&r1=1329767&r2=1329768&view=diff
==============================================================================
--- karaf/trunk/instance/command/pom.xml (original)
+++ karaf/trunk/instance/command/pom.xml Tue Apr 24 14:52:55 2012
@@ -103,9 +103,9 @@
<configuration>
<instructions>
<Private-Package>
- org.apache.karaf.instance.main
+ org.apache.karaf.instance.main,
org.apache.karaf.instance.command,
- org.apache.karaf.instance.command.completers,
+ org.apache.karaf.instance.command.completers
</Private-Package>
</instructions>
</configuration>
Modified: karaf/trunk/instance/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/pom.xml?rev=1329768&r1=1329767&r2=1329768&view=diff
==============================================================================
--- karaf/trunk/instance/core/pom.xml (original)
+++ karaf/trunk/instance/core/pom.xml Tue Apr 24 14:52:55 2012
@@ -138,7 +138,7 @@
org.apache.karaf.jpm,
org.apache.karaf.jpm.impl,
org.apache.karaf.instance.core.internal,
- org.apache.felix.utils.properties
+ org.apache.felix.utils.properties;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml?rev=1329768&r1=1329767&r2=1329768&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml (original)
+++ karaf/trunk/instance/core/src/main/resources/OSGI-INF/blueprint/instance-core.xml Tue Apr 24 14:52:55 2012
@@ -18,7 +18,6 @@
-->
<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 />
@@ -33,7 +32,7 @@
<argument ref="instanceService" />
</bean>
- <service ref="mbeanImpl" interface="org.apache.karaf.instance.core.InstancesMBean">
+ <service ref="mbeanImpl" auto-export="interfaces">
<service-properties>
<entry key="jmx.objectname" value="org.apache.karaf:type=instance,name=${karaf.name}"/>
</service-properties>