[prev in list] [next in list] [prev in thread] [next in thread] 

List:       activemq-commits
Subject:    [2/3] activemq-artemis git commit: Make it easier to install artemis on karaf
From:       clebertsuconic () apache ! org
Date:       2015-12-28 0:04:56
Message-ID: c528f895382b4f618cef11c7536d3125 () git ! apache ! org
[Download RAW message or body]

Make it easier to install artemis on karaf


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

Branch: refs/heads/master
Commit: daf4c84b07695ed4ba79616714a9ae45d4603499
Parents: 81ffe34
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Sun Dec 27 09:24:17 2015 +0100
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Sun Dec 27 09:24:17 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/daf4c84b/artemis-features/src/main/resources/features.xml
                
----------------------------------------------------------------------
diff --git a/artemis-features/src/main/resources/features.xml \
b/artemis-features/src/main/resources/features.xml index 5011245..aa24a36 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/daf4c84b/docs/user-manual/en/karaf.md
                
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/karaf.md b/docs/user-manual/en/karaf.md
index b0adcb4..dce4f8f 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


[prev in list] [next in list] [prev in thread] [next in thread]