Updated Branches: refs/heads/trunk 2bbfbcfb2 -> 6258ce176
[AMQ-4931] Use auto-export="interfaces" in the Karaf commands service definition Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6258ce17 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6258ce17 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6258ce17 Branch: refs/heads/trunk Commit: 6258ce1761538035059399b605ee10d4a2316263 Parents: 2bbfbcf Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Dec 11 14:03:02 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Dec 11 14:03:02 2013 +0100 ---------------------------------------------------------------------- .../OSGI-INF/blueprint/activemq-karaf.xml | 36 ++++---------------- 1 file changed, 6 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/6258ce17/activemq-karaf/src/main/resources/OSGI-INF/blueprint/activemq-karaf.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf/src/main/resources/OSGI-INF/blueprint/activemq-karaf.xml b/activemq-karaf/src/main/resources/OSGI-INF/blueprint/activemq-karaf.xml index 1a5d561..f5dda89 100644 --- a/activemq-karaf/src/main/resources/OSGI-INF/blueprint/activemq-karaf.xml +++ b/activemq-karaf/src/main/resources/OSGI-INF/blueprint/activemq-karaf.xml @@ -27,11 +27,7 @@ <property name="actionId" value="listaction"/> </bean> - <service ref="listcommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="listcommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="list"/> @@ -53,11 +49,7 @@ <property name="actionId" value="queryaction"/> </bean> - <service ref="querycommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="querycommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="query"/> @@ -79,11 +71,7 @@ <property name="actionId" value="browseaction"/> </bean> - <service ref="browsecommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="browsecommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="browse"/> @@ -105,11 +93,7 @@ <property name="actionId" value="bstataction"/> </bean> - <service ref="bstatcommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="bstatcommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="bstat"/> @@ -131,11 +115,7 @@ <property name="actionId" value="purgeaction"/> </bean> - <service ref="purgecommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="purgecommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="purge"/> @@ -157,11 +137,7 @@ <property name="actionId" value="dstataction"/> </bean> - <service ref="dstatcommand" activation="lazy"> - <interfaces> - <value>org.apache.felix.service.command.Function</value> - <value>org.apache.karaf.shell.console.CompletableFunction</value> - </interfaces> + <service ref="dstatcommand" auto-export="interfaces" activation="lazy"> <service-properties> <entry key="osgi.command.scope" value="activemq"/> <entry key="osgi.command.function" value="dstat"/>
