From b1a7e750993832af401aaa841b9bfbb15234f8cb Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Wed, 30 Jan 2013 15:01:57 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4034 - adding
 activemq-http feature

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

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 4f6a94c721..3d223c9531 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -65,11 +65,12 @@
         <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
         <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
+        <feature version="${project.version}">activemq-http</feature>
     </feature>
 
-    <feature name="activemq-optional" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq-http" version="${project.version}" resolver="(obr)" start-level="50">
         <feature>jetty</feature>
-        <bundle>mvn:org.apache.activemq/activemq-optional/${project.version}</bundle>
+        <bundle>mvn:org.apache.activemq/activemq-http/${project.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
@@ -77,7 +78,6 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient-version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-version}</bundle>
-        <bundle>mvn:org.springframework/spring-oxm/${spring-version}</bundle>
         <bundle>mvn:javax.jmdns/jmdns/${jmdns-version}</bundle>
     </feature>