From 81ffe3467a13f7aef784b32eb2d1824280941fd0 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Sun, 27 Dec 2015 09:19:56 +0100
Subject: [PATCH 1/2] Tidy up readme and move the karaf docs into the user
 guide.

---
 README.md                      |  3 ---
 docs/user-manual/en/SUMMARY.md |  1 +
 docs/user-manual/en/karaf.md   | 13 +++++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 docs/user-manual/en/karaf.md

diff --git a/README.md b/README.md
index 782589b258a..d8109a01d42 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,4 @@ If you are trying to copy the examples somewhere else and modifying them. Consid
     # if trying to modify the 'topic' example:
     cd examples/jms/topic && mvn dependency:list
 
-## Artemis on Apache Karaf
 
-feature:repo-add mvn:org.apache.activemq/artemis-features/1.1.1-SNAPSHOT/xml
-feature:install artemis-core artemis-hornetq artemis-stomp artemis-mqtt artemis-amqp
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 1bb65520333..127dff004b5 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -47,6 +47,7 @@
 * [Logging](logging.md)
 * [REST Interface](rest.md)
 * [Embedding Apache ActiveMQ Artemis](embedding-activemq.md)
+* [Apache Karaf](karaf.md)
 * [Spring Integration](spring-integration.md)
 * [AeroGear Integration](aerogear-integration.md)
 * [VertX Integration](vertx-integration.md)
diff --git a/docs/user-manual/en/karaf.md b/docs/user-manual/en/karaf.md
new file mode 100644
index 00000000000..b0adcb43879
--- /dev/null
+++ b/docs/user-manual/en/karaf.md
@@ -0,0 +1,13 @@
+# Artemis on Apache Karaf
+
+Apache ActiveMQ Artemis can be installed on Apache Karaf using the following commands from the Karaf shell:
+
+    feature:repo-add mvn:org.apache.activemq/artemis-features/1.2.1-SNAPSHOT/xml
+    feature:install artemis-core
+
+And the various protocols can be installed using:
+
+    feature:install artemis-hornetq
+    feature:install artemis-stomp
+    feature:install artemis-mqtt
+    feature:install artemis-amqp

From daf4c84b07695ed4ba79616714a9ae45d4603499 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Sun, 27 Dec 2015 09:24:17 +0100
Subject: [PATCH 2/2] Make it easier to install artemis on karaf

---
 artemis-features/src/main/resources/features.xml | 10 ++++++++--
 docs/user-manual/en/karaf.md                     | 10 ++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 5011245c9f2..aa24a361a67 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -19,6 +19,14 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
+  <feature name="artemis" version="${pom.version}">
+    <feature>artemis-core</feature>
+    <feature>artemis-amqp</feature>
+    <feature>artemis-stomp</feature>
+    <feature>artemis-mqtt</feature>
+    <feature>artemis-hornetq</feature>
+  </feature>
+
 	<feature name="netty-core" version="${netty.version}">
 		<bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
 		<bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
@@ -45,7 +53,6 @@
 
 		<bundle>mvn:org.apache.activemq/artemis-native/${pom.version}</bundle>
 		<bundle>mvn:org.apache.activemq/artemis-server-osgi/${pom.version}</bundle>
-
 	</feature>
 
 	<feature name="artemis-amqp" version="${pom.version}">
@@ -62,7 +69,6 @@
 		<bundle>mvn:org.apache.activemq/artemis-stomp-protocol/${pom.version}</bundle>
 	</feature>
 
-
 	<feature name="artemis-mqtt" version="${pom.version}">
 		<feature>artemis-core</feature>
 		<bundle>mvn:org.apache.activemq/artemis-mqtt-protocol/${pom.version}</bundle>
diff --git a/docs/user-manual/en/karaf.md b/docs/user-manual/en/karaf.md
index b0adcb43879..dce4f8fdb46 100644
--- a/docs/user-manual/en/karaf.md
+++ b/docs/user-manual/en/karaf.md
@@ -1,13 +1,7 @@
 # Artemis on Apache Karaf
 
-Apache ActiveMQ Artemis can be installed on Apache Karaf using the following commands from the Karaf shell:
+Apache ActiveMQ Artemis can be installed on Apache Karaf (4.x or later) using the following commands from the Karaf shell:
 
     feature:repo-add mvn:org.apache.activemq/artemis-features/1.2.1-SNAPSHOT/xml
-    feature:install artemis-core
+    feature:install artemis
 
-And the various protocols can be installed using:
-
-    feature:install artemis-hornetq
-    feature:install artemis-stomp
-    feature:install artemis-mqtt
-    feature:install artemis-amqp