Repository: activemq-artemis
Updated Branches:
  refs/heads/master 1bb2d0837 -> 4f8aae0a4


Tidy up readme and move the karaf docs into the user guide.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/81ffe346
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/81ffe346
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/81ffe346

Branch: refs/heads/master
Commit: 81ffe3467a13f7aef784b32eb2d1824280941fd0
Parents: 1bb2d08
Author: Claus Ibsen <[email protected]>
Authored: Sun Dec 27 09:19:56 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Sun Dec 27 09:19:56 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81ffe346/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 782589b..d8109a0 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81ffe346/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 1bb6552..127dff0 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)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81ffe346/docs/user-manual/en/karaf.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/karaf.md b/docs/user-manual/en/karaf.md
new file mode 100644
index 0000000..b0adcb4
--- /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

Reply via email to