From afe2e3ca08efc5150c334fd97fd9119a21bf7f56 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Thu, 20 Jun 2013 11:29:43 +0000
Subject: [PATCH] fix some osgi regressions

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

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 607dd15224..561fec31e1 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -66,6 +66,13 @@
 -->
     </feature>
 
+    <!-- Starts the broker with default configuration -->
+    <feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}" resolver="(obr)" start-level="50">
+        <feature version="${project.version}">activemq</feature>
+        <configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
+        <configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
+    </feature>
+
     <!-- Starts the broker with default configuration and web console -->
     <feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}" resolver="(obr)" start-level="50">
         <feature version="${project.version}">activemq</feature>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 4ddc623acd..bf1b8a6f0b 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -54,6 +54,8 @@
   	  org.eclipse.jetty*;resolution:=optional,
   	  org.fusesource.fabric*;version="[7,8]";resolution:=optional,
   	  org.fusesource.fabric.groups*;version="[7,8]";resolution:=optional,
+      org.apache.zookeeper;resolution:=optional,
+      org.linkedin*;resolution:=optional,
   	  org.springframework.jms*;version="[3,4]";resolution:=optional,
   	  org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
   	  org.springframework.transaction*;version="[3,4]";resolution:=optional,