Return-Path: 
 <commits-return-24094-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 877E510776
	for <apmail-activemq-commits-archive@www.apache.org>;
 Wed, 11 Dec 2013 13:05:08 +0000 (UTC)
Received: (qmail 64471 invoked by uid 500); 11 Dec 2013 13:05:08 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 64390 invoked by uid 500); 11 Dec 2013 13:05:05 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 64382 invoked by uid 99); 11 Dec 2013 13:05:05 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 13:05:05 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id B9A17889821; Wed, 11 Dec 2013 13:05:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: jbonofre@apache.org
To: commits@activemq.apache.org
Message-Id: <7e7d215dd83f49968f2b6c21b5647479@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [AMQ-4931] Use auto-export="interfaces" in the Karaf
 commands service definition
Date: Wed, 11 Dec 2013 13:05:04 +0000 (UTC)

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é <jbonofre@apache.org>
Authored: Wed Dec 11 14:03:02 2013 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
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"/>