diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index e32e966ba0..761c6d99ec 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -52,7 +52,7 @@ under the License.
tcp://${activemq.remoting.stomp.host:${host}}:${activemq.remoting.stomp.port:${stomp.port}}?protocols=STOMP
- tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=CORE,STOMP
+ tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=HORNETQ,STOMP
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-store.settings}
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index d9879c4dc0..7dffc25404 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -117,6 +117,11 @@
artemis-openwire-protocol
${project.version}
+
+ org.apache.activemq
+ artemis-hornetq-protocol
+ ${project.version}
+
org.apache.activemq
artemis-native
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index bd8e60b644..8433867075 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -58,6 +58,7 @@
org.apache.activemq:artemis-amqp-protocol
org.apache.activemq:artemis-openwire-protocol
org.apache.activemq:artemis-proton-plug
+ org.apache.activemq:artemis-hornetq-protocol
org.apache.activemq:artemis-stomp-protocol
org.apache.activemq:artemis-ra
org.apache.activemq:artemis-selector
diff --git a/artemis-distribution/src/main/resources/README.html b/artemis-distribution/src/main/resources/README.html
index 1b7b1a9767..15b7ebf104 100644
--- a/artemis-distribution/src/main/resources/README.html
+++ b/artemis-distribution/src/main/resources/README.html
@@ -28,32 +28,41 @@ under the License.
Getting Started
-Starting the Broker
-
Note (Windows users): The broker currently does not support spaces in path names. For this reason the broker should be placed in a directory with no spaces in it's absolute path.
Note (Windows users): Examples below use the shell script `activemq` for use with linux, Windows users should use the `activemq.cmd` script with the same parameters.
-To run the ActiveMQ broker with the default configuration, run the command shown below from the "bin" directory.
+Creating a broker
-$ ./activemq run
+To create a broker, navigate to the distribution 'bin/' directory and run:
+
+$ ./artemis create $directory Where $directory is the folder that you'd like the broker to be created.
+
+Starting the Broker
+
+Once the broker has been created, use the artemis (or artemis.cmd on windows) script of the under the bin directory of the newly created broker to manage the life cycle of the broker.
+
+To run the Apache ActiveMQ Artemis broker with the default configuration, run the command shown below from the "bin" directory of the created broker.
+
+$ ./artemis run
To specify a broker configuration file:
-$ ./activemq run --config scheme:location
+$ ./artemis run --config scheme:location
e.g.
-$ ./activemq run --config xml:/home/activemq/bootstrap.xml
+$ ./artemis run --config xml:/home/activemq/bootstrap.xml
The distribution ships with a number of example configurations that can be used to get started. You can find these under the "config" directory.
-It is possible to configure run time paramters in the activemq.conf (activemq.conf.bat for windows) file under the "bin" directory.
+It is possible to configure run time paramters in the artemis.conf (artemis.conf.bat for windows) file under the "bin" directory of the broker directory.
+
Stopping the Broker
-To stop the broker please use the activemq script:
+To stop the broker please use the artemis script from the broker's bin directory:
-$ ./activemq stop
+$ ./artemis stop
Documentation