From 0d8ce9f87ce82cc3d8cd783f7b6f3762cc638996 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Wed, 29 Feb 2012 12:14:01 +0000
Subject: [PATCH] add activemq-camel feature, remove invalid url param from mvn
 war for console

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1295072 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-karaf/src/main/resources/features.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index b910fdc1ac..541acb6109 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -67,10 +67,15 @@
         <bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
     </feature>
 
-    <!-- do "features:install war" before installing this one  -->
+    <feature name="activemq-camel" version="${activemq-version}" resolver="(obr)">
+        <feature version="${activemq-version}">activemq</feature>
+        <feature version="${camel-version}">camel-jms</feature>
+        <bundle>mvn:org.apache.activemq/activemq-camel/${activemq-version}</bundle>
+    </feature>
+
     <feature name="activemq-web-console" version="${activemq-version}" resolver="(obr)">
       <feature version="[2,3)">war</feature>
-      <bundle>mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war?Webapp-Context=activemq-web-console</bundle>
+      <bundle>mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war</bundle>
     </feature>
 </features>