camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lburgazz...@apache.org
Subject camel git commit: CAMEL-10410: Karaf features: install camel-karaf-commands and camel-karaf-commands-catalog only if karaf shell is installed
Date Mon, 24 Oct 2016 10:28:33 GMT
Repository: camel
Updated Branches:
  refs/heads/master feeb8c1fe -> 820b4a6ab


CAMEL-10410: Karaf features: install camel-karaf-commands and camel-karaf-commands-catalog
only if karaf shell is installed


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/820b4a6a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/820b4a6a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/820b4a6a

Branch: refs/heads/master
Commit: 820b4a6abcfd2580b7b10a2afe983f677c485912
Parents: feeb8c1
Author: lburgazzoli <lburgazzoli@gmail.com>
Authored: Mon Oct 24 12:27:36 2016 +0200
Committer: lburgazzoli <lburgazzoli@gmail.com>
Committed: Mon Oct 24 12:27:36 2016 +0200

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/820b4a6a/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 2207a7d..b55017f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -40,7 +40,10 @@
     <!-- the camel commands requires the camel-catalog to be installed -->
     <bundle>mvn:org.apache.camel/camel-catalog/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
+    <conditional>
+      <condition>shell</condition>
+      <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
+    </conditional>
     <!-- allow camel to access its own mbeans for karaf commands and other needs -->
     <config name="jmx.acl.org.apache.camel">
       * = *
@@ -49,7 +52,10 @@
   <feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'>
     <details>Install the camel catalog commands</details>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
+    <conditional>
+      <condition>shell</condition>
+      <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
+    </conditional>
   </feature>
   <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>


Mime
View raw message