From 44a5a05ca45581d47c4369757b1bcabdb541d7c9 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 22 Jan 2010 15:59:42 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-2570 -
 finishing up karaf feature for web console

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

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index bacd4374e8..53c697f95a 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -27,7 +27,7 @@
     </feature>
     
     <feature name="activemq" version="${activemq-version}">
-        <feature version="1.2.0">http</feature>
+        <feature version="1.1.1">servlet-2.5</feature>
         <feature version="${spring-version}">spring</feature>
         <feature version="1.2.0">spring-dm</feature> 
         <feature version="4.0.0">connector</feature> 
@@ -46,10 +46,9 @@
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.1.0-SNAPSHOT</bundle> 
     </feature>
     
+    <!-- do "features:install pax-web" before installing this one  -->
     <feature name="activemq-web-console" version="${activemq-version}">
-        <feature version="${activemq-version}">activemq</feature>
-        <feature version='0.7.2'>pax-web-extenders</feature> 
-        <feature version='1.1.1'>pax-url-war</feature> 
-        <bundle>mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war</bundle>
+        <!-- <feature version="0.7.2">pax-web</feature> - it doesn't see 'war' protocol since they are installed as the same feature -->
+        <bundle>war:mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war?Webapp-Context=activemq-web-console</bundle>
     </feature>
 </features>
\ No newline at end of file