From fbe632e968b16efb6ea841d3478cc42760918155 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Thu, 14 Mar 2013 13:13:00 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4341 - making
 package imports optional, so activemq-osgi can be used without all the deps

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1456415 13f79535-47bb-0310-9956-ffa450edef68
---
 .../karaf/itest/org.apache.activemq.webconsole.cfg |  4 +++-
 activemq-osgi/pom.xml                              | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.webconsole.cfg b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.webconsole.cfg
index 76fc495efc..17b31c2597 100644
--- a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.webconsole.cfg
+++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.webconsole.cfg
@@ -18,4 +18,6 @@
 webconsole.jms.url=tcp://localhost:61616
 webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-root
 webconsole.jmx.user=karaf
-webconsole.jmx.password=karaf
\ No newline at end of file
+webconsole.jmx.password=karaf
+webconsole.jms.user=karaf
+webconsole.jms.password=karaf
\ No newline at end of file
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index bcf6c8a0b4..e18fc985c2 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -58,13 +58,13 @@
   	  org.xmlpull*;resolution:=optional,
   	  scala*;resolution:=optional,
       org.springframework*;version="[3,4]";resolution:=optional,
-      org.apache.xbean.spring*,
-  	  javax.annotation*,
-  	  javax.jms*,
-  	  javax.management*,
-  	  javax.transaction*,
-  	  org.apache.commons.pool*,
-  	  org.apache.commons.net*,
+      org.apache.xbean.spring*;resolution:=optional,
+      javax.annotation*;resolution:=optional,
+      javax.jms*;resolution:=optional,
+      javax.management*;resolution:=optional,
+      javax.transaction*;resolution:=optional,
+      org.apache.commons.pool*;resolution:=optional,
+      org.apache.commons.net*;resolution:=optional,
 	  *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>