activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [08/15] activemq-6 git commit: Remove references to HornetQ in doc and Comments
Date Wed, 19 Nov 2014 15:38:30 GMT
Remove references to HornetQ in doc and Comments


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

Branch: refs/heads/master
Commit: 4a6b980fed58523e759bfb957660e02d1db6e47b
Parents: 2fbd5d7
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Wed Nov 19 08:44:57 2014 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Wed Nov 19 15:15:35 2014 +0000

----------------------------------------------------------------------
 NOTICE                                          |   8 +-
 RELEASING.md                                    |   8 +-
 .../org/apache/activemq/cli/banner.txt          |   2 +-
 activemq-native/README                          |   2 +-
 .../java/org/apache/activemq/ra/package.html    |   2 +-
 .../src/main/resources/schema/hornetq-rest.xsd  |  12 +-
 .../org/apache/activemq/security/basic-security |   2 +-
 .../main/resources/config/logging.properties    |   2 +-
 docs/README.html                                |   8 +-
 docs/design-guide/en/Author_Group.xml           |   2 +-
 docs/design-guide/en/Book_Info.xml              |  12 +-
 docs/design-guide/en/HornetQ_Design_Guide.ent   |   4 +-
 docs/design-guide/en/HornetQ_Design_Guide.xml   |   2 +-
 docs/design-guide/en/about.xml                  |   6 +-
 docs/design-guide/en/clustering.xml             |   2 +-
 docs/design-guide/en/notice.xml                 |   2 +-
 docs/design-guide/pom.xml                       |   4 +-
 docs/eap-manual/en/Author_Group.xml             |   2 +-
 docs/eap-manual/en/Book_Info.xml                |  12 +-
 docs/eap-manual/en/HornetQ_EAP_Manual.ent       |   4 +-
 docs/eap-manual/en/HornetQ_EAP_Manual.xml       |   2 +-
 docs/eap-manual/en/clusters.xml                 |  28 ++---
 docs/eap-manual/pom.xml                         |   4 +-
 docs/quickstart-guide/en/Author_Group.xml       |   2 +-
 docs/quickstart-guide/en/Book_Info.xml          |  12 +-
 .../en/HornetQ_QuickStart_Guide.ent             |   4 +-
 .../en/HornetQ_QuickStart_Guide.xml             |   2 +-
 docs/quickstart-guide/en/about.xml              |  22 ++--
 docs/quickstart-guide/en/download.xml           |   8 +-
 docs/quickstart-guide/en/examples.xml           |  48 ++++----
 docs/quickstart-guide/en/installation.xml       |  26 ++--
 docs/quickstart-guide/en/introduction.xml       |   6 +-
 docs/quickstart-guide/en/notice.xml             |   2 +-
 docs/quickstart-guide/en/running.xml            |  20 ++--
 docs/quickstart-guide/pom.xml                   |   4 +-
 docs/quickstart-guide/zh/about.xml              |  24 ++--
 docs/quickstart-guide/zh/download.xml           |  12 +-
 docs/quickstart-guide/zh/examples.xml           |  22 ++--
 docs/quickstart-guide/zh/installation.xml       |  46 +++----
 docs/quickstart-guide/zh/introduction.xml       |   8 +-
 docs/quickstart-guide/zh/master.xml             |   2 +-
 docs/quickstart-guide/zh/running.xml            |  28 ++---
 docs/user-manual/zh/appserver-integration.xml   |  90 +++++++-------
 docs/user-manual/zh/architecture.xml            |  50 ++++----
 docs/user-manual/zh/client-classpath.xml        |   8 +-
 docs/user-manual/zh/client-reconnection.xml     |  10 +-
 docs/user-manual/zh/clusters.xml                |  67 +++++------
 docs/user-manual/zh/configuration-index.xml     |   6 +-
 docs/user-manual/zh/configuring-transports.xml  |  52 ++++----
 docs/user-manual/zh/connection-ttl.xml          |  18 +--
 docs/user-manual/zh/core-bridges.xml            |   6 +-
 docs/user-manual/zh/diverts.xml                 |   4 +-
 docs/user-manual/zh/duplicate-detection.xml     |   8 +-
 docs/user-manual/zh/embedding-hornetq.xml       |  66 +++++-----
 docs/user-manual/zh/examples.xml                | 120 +++++++++----------
 docs/user-manual/zh/filter-expressions.xml      |   6 +-
 docs/user-manual/zh/flow-control.xml            |  22 ++--
 docs/user-manual/zh/ha.xml                      |  44 +++----
 docs/user-manual/zh/intercepting-operations.xml |   2 +-
 docs/user-manual/zh/interoperability.xml        |  32 ++---
 docs/user-manual/zh/jms-bridge.xml              |  22 ++--
 docs/user-manual/zh/jms-core-mapping.xml        |   4 +-
 docs/user-manual/zh/large-messages.xml          |  18 +--
 docs/user-manual/zh/libaio.xml                  |  20 ++--
 docs/user-manual/zh/logging.xml                 |   8 +-
 docs/user-manual/zh/management.xml              |  76 ++++++------
 docs/user-manual/zh/master.xml                  |   2 +-
 docs/user-manual/zh/message-expiry.xml          |   8 +-
 docs/user-manual/zh/message-grouping.xml        |   6 +-
 docs/user-manual/zh/messaging-concepts.xml      |  26 ++--
 docs/user-manual/zh/paging.xml                  |  14 +--
 docs/user-manual/zh/perf-tuning.xml             |  16 +--
 docs/user-manual/zh/persistence.xml             |  44 +++----
 docs/user-manual/zh/pre-acknowledge.xml         |   8 +-
 docs/user-manual/zh/preface.xml                 |  24 ++--
 docs/user-manual/zh/project-info.xml            |  14 +--
 docs/user-manual/zh/queue-attributes.xml        |   2 +-
 docs/user-manual/zh/security.xml                |  46 +++----
 docs/user-manual/zh/send-guarantees.xml         |  14 +--
 docs/user-manual/zh/thread-pooling.xml          |  24 ++--
 docs/user-manual/zh/transaction-config.xml      |   8 +-
 docs/user-manual/zh/undelivered-messages.xml    |   8 +-
 docs/user-manual/zh/using-core.xml              |  22 ++--
 docs/user-manual/zh/using-jms.xml               |  30 ++---
 docs/user-manual/zh/using-server.xml            | 108 ++++++++---------
 docs/user-manual/zh/wildcard-routing.xml        |   2 +-
 docs/user-manual/zh/wildcard-syntax.xml         |   6 +-
 etc/IDEA-style.jar                              | Bin 3551 -> 3553 bytes
 etc/findbugs-exclude.xml                        |   6 +-
 etc/org.eclipse.jdt.ui.prefs                    |   4 +-
 examples/core/embedded-remote/readme.html       |  14 +--
 examples/core/embedded/readme.html              |  14 +--
 examples/core/twitter-connector/readme.html     |   8 +-
 examples/core/vertx-connector/readme.html       |  10 +-
 examples/javaee/ejb-jms-transaction/readme.html |   2 +-
 examples/javaee/jca-config/readme.html          |   8 +-
 examples/javaee/jca-remote/readme.html          |   8 +-
 examples/javaee/jms-bridge/readme.html          |   4 +-
 .../javaee/jms-context-injection/readme.html    |   2 +-
 examples/javaee/mdb-bmt/readme.html             |   2 +-
 .../readme.html                                 |   2 +-
 .../javaee/mdb-cmt-setrollbackonly/readme.html  |   2 +-
 examples/javaee/mdb-cmt-tx-local/readme.html    |   2 +-
 .../javaee/mdb-cmt-tx-not-supported/readme.html |   2 +-
 examples/javaee/mdb-cmt-tx-required/readme.html |   2 +-
 .../javaee/mdb-message-selector/readme.html     |   2 +-
 .../mdb-remote-failover-static/readme.html      |   2 +-
 examples/javaee/mdb-remote-failover/readme.html |   2 +-
 examples/javaee/mdb-tx-send/readme.html         |   2 +-
 examples/javaee/xarecovery/readme.html          |   6 +-
 examples/jms/README.md                          |   2 +-
 .../config/logging.properties                   |   4 +-
 .../activemq-ra-rar/src/main/resources/ra.xml   |  16 +--
 examples/jms/aerogear/readme.html               |  10 +-
 examples/jms/applet/applet.html                 |   6 +-
 examples/jms/applet/readme.html                 |   4 +-
 .../jms/application-layer-failover/readme.html  |  12 +-
 examples/jms/bridge/readme.html                 |  10 +-
 examples/jms/browser/readme.html                |   4 +-
 examples/jms/client-kickoff/readme.html         |  20 ++--
 .../hornetq/server0/activemq-configuration.xml  |   2 +-
 .../client-side-failoverlistener/readme.html    |   4 +-
 .../jms/client-side-load-balancing/readme.html  |   8 +-
 .../clustered-durable-subscription/readme.html  |   6 +-
 examples/jms/clustered-grouping/readme.html     |  10 +-
 examples/jms/clustered-jgroups/readme.html      |  12 +-
 examples/jms/clustered-queue/readme.html        |  10 +-
 examples/jms/clustered-standalone/readme.html   |   2 +-
 .../jms/clustered-static-discovery/readme.html  |  10 +-
 .../jms/clustered-static-oneway/readme.html     |  10 +-
 examples/jms/clustered-topic/readme.html        |   4 +-
 .../colocated-failover-scale-down/readme.html   |   2 +-
 examples/jms/colocated-failover/readme.html     |   2 +-
 examples/jms/consumer-rate-limit/readme.html    |   6 +-
 examples/jms/dead-letter/readme.html            |  10 +-
 examples/jms/delayed-redelivery/readme.html     |   4 +-
 examples/jms/divert/readme.html                 |   4 +-
 examples/jms/durable-subscription/readme.html   |   4 +-
 examples/jms/embedded-simple/readme.html        |   8 +-
 examples/jms/embedded/readme.html               |  14 +--
 examples/jms/expiry/readme.html                 |  12 +-
 examples/jms/http-transport/readme.html         |   8 +-
 .../instantiate-connection-factory/readme.html  |   8 +-
 examples/jms/interceptor/readme.html            |   6 +-
 examples/jms/jaas/readme.html                   |  14 +--
 examples/jms/jms-auto-closeable/readme.html     |   2 +-
 examples/jms/jms-bridge/readme.html             |  12 +-
 .../jms/jms-completion-listener/readme.html     |   6 +-
 examples/jms/jms-context/readme.html            |   4 +-
 examples/jms/jms-shared-consumer/readme.html    |   2 +-
 examples/jms/jmx/readme.html                    |   8 +-
 .../hornetq/server0/activemq-configuration.xml  |   2 +-
 examples/jms/large-message/readme.html          |  12 +-
 examples/jms/last-value-queue/readme.html       |   4 +-
 .../jms/management-notifications/readme.html    |  10 +-
 examples/jms/management/readme.html             |  12 +-
 examples/jms/message-counters/readme.html       |   8 +-
 examples/jms/message-group/readme.html          |   6 +-
 examples/jms/message-group2/readme.html         |   6 +-
 examples/jms/message-priority/readme.html       |   2 +-
 examples/jms/no-consumer-buffering/readme.html  |  10 +-
 .../jms/non-transaction-failover/readme.html    |   4 +-
 examples/jms/openwire/readme.html               |   4 +-
 examples/jms/paging/readme.html                 |   6 +-
 examples/jms/perf/readme.html                   |   2 +-
 examples/jms/pre-acknowledge/readme.html        |  10 +-
 examples/jms/producer-rate-limit/readme.html    |   6 +-
 examples/jms/proton-cpp/readme.html             |  10 +-
 examples/jms/proton-j/readme.html               |  10 +-
 examples/jms/proton-ruby/readme.html            |   6 +-
 .../queue-message-redistribution/readme.html    |  14 +--
 examples/jms/queue-requestor/readme.html        |   4 +-
 examples/jms/queue-selector/readme.html         |   2 +-
 examples/jms/queue/readme.html                  |   4 +-
 examples/jms/reattach-node/readme.html          |   8 +-
 .../jms/replicated-failback-static/readme.html  |   4 +-
 examples/jms/replicated-failback/readme.html    |   4 +-
 .../replicated-multiple-failover/readme.html    |   4 +-
 .../replicated-transaction-failover/readme.html |   6 +-
 examples/jms/request-reply/readme.html          |   2 +-
 examples/jms/rest/dup-send/README.txt           |   2 +-
 examples/jms/rest/javascript-chat/README.txt    |   2 +-
 examples/jms/rest/jms-to-rest/README.txt        |   2 +-
 examples/jms/rest/push/README.txt               |   4 +-
 examples/jms/scale-down/readme.html             |   2 +-
 examples/jms/scheduled-message/readme.html      |   4 +-
 examples/jms/security/readme.html               |  18 +--
 examples/jms/send-acknowledgements/readme.html  |   6 +-
 examples/jms/spring-integration/readme.html     |   6 +-
 examples/jms/ssl-enabled/readme.html            |   6 +-
 examples/jms/static-selector-jms/readme.html    |   6 +-
 examples/jms/static-selector/readme.html        |   8 +-
 examples/jms/stomp-websockets/readme.html       |   8 +-
 examples/jms/stomp/readme.html                  |   8 +-
 examples/jms/stomp1.1/readme.html               |   8 +-
 examples/jms/stomp1.2/readme.html               |   8 +-
 examples/jms/stop-server-failover/readme.html   |   4 +-
 examples/jms/symmetric-cluster/readme.html      |  18 +--
 examples/jms/temp-queue/readme.html             |   4 +-
 examples/jms/topic-hierarchies/readme.html      |  14 +--
 .../jms/topic-selector-example1/readme.html     |   2 +-
 .../jms/topic-selector-example2/readme.html     |   4 +-
 examples/jms/topic/readme.html                  |   4 +-
 examples/jms/transaction-failover/readme.html   |   6 +-
 examples/jms/transactional/readme.html          |   4 +-
 examples/jms/xa-heuristic/readme.html           |   6 +-
 examples/jms/xa-receive/readme.html             |   4 +-
 examples/jms/xa-send/readme.html                |   6 +-
 examples/jms/xa-with-jta/readme.html            |   6 +-
 examples/soak/normal/README                     |   2 +-
 tests/config/logging.properties                 |   2 +-
 tests/config/logging.properties.trace           |   2 +-
 .../src/test/resources/jbossjta-properties.xml  |   2 +-
 213 files changed, 1199 insertions(+), 1200 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 288a13f..9584e27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,14 +1,14 @@
-HornetQ
+ActiveMQ
 Copyright 2009 Red Hat, Inc.  Licensed under the Apache License, version 2.0.
-Unless required by applicable law, HornetQ is distributed on
+Unless required by applicable law, ActiveMQ is distributed on
 an "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, either express or
 implied, including the implied warranties of TITLE, NON-INFRINGEMENT,
 MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
 
-Certain portions of HornetQ are based on code made available
+Certain portions of ActiveMQ are based on code made available
 under the GNU Lesser General Public License, version 2.1 or later
 (http://www.fsf.org/licensing/licenses/lgpl.html).
 "JBoss" and "Red Hat" are trademarks of Red Hat, Inc. and/or its
 affiliates, registered in the U.S. and other countries.  Your
-permissions under the licensing terms governing HornetQ do
+permissions under the licensing terms governing ActiveMQ do
 not include a license, express or implied, to any Red Hat trademark.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/RELEASING.md
----------------------------------------------------------------------
diff --git a/RELEASING.md b/RELEASING.md
index 1f83987..bf5a5ef 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -18,12 +18,12 @@ Assuming current version is ``X.Y.Z-SNAPSHOT``
 
 0. Update the release notes.
 1. Prepare a single commit changing all version tags in all pom's.
-2. tag this commit locally by 'git tag -a HornetQ_X_Y_Z_Final -m "release for x.y.z.Final' or what ever the version is
+2. tag this commit locally by 'git tag -a ActiveMQ_X_Y_Z_Final -m "release for x.y.z.Final' or what ever the version is
 3. remember to update the version in the main pom, think of a cool name if you can
 4. update the hornetq-maven-plugin plugin in the main pom to one that is released, if needed release a new version of the plugin.
 5. Either use ``git revert`` to create a new commit reverting the commit with the version changes. Or change again all versions to ``R.S.T-SNAPSHOT``.
 6. push both commits with version changes together, including them in the same _pull-request_.
-7. push the committed tag upstream 'git push upstream HornetQ_X_Y_Z_Final'
+7. push the committed tag upstream 'git push upstream ActiveMQ_X_Y_Z_Final'
 8. download and unpack the tag from github
 9. firstly upload the maven artifacts to the staged repository 'mvn -Pmaven-release deploy' (you will need the repository details in your settings.xml'
 10. go to nexus (https://repository.jboss.org/nexus/index.html), log in, select staging repositories, select the staging profile that you uploaded and close it.
@@ -55,7 +55,7 @@ If everything is ok then release by:
 
 if there is a problem
 
-1. delete the tag locally 'git tag -d HornetQ_X_Y_Z_Final"
-2. delete the tag remotely 'git push origin :refs/tags/HornetQ_X_Y_Z_Final"
+1. delete the tag locally 'git tag -d ActiveMQ_X_Y_Z_Final"
+2. delete the tag remotely 'git push origin :refs/tags/ActiveMQ_X_Y_Z_Final"
 3. go to nexus and drop the profile
 4. fix what's broken and start again

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
index 411caec..cddde50 100644
--- a/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
+++ b/activemq-bootstrap/src/main/filtered-resources/org/apache/activemq/cli/banner.txt
@@ -3,6 +3,6 @@
  | |_| |/ _ \| '__| '_ \ / _ \ __| | | |
  |  _  | (_) | |  | | | |  __/ |_| |_| |
  |_| |_|\___/|_|  |_| |_|\___|\__|\__\_\
- HornetQ ${project.version}
+ ActiveMQ ${project.version}
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/activemq-native/README
----------------------------------------------------------------------
diff --git a/activemq-native/README b/activemq-native/README
index a40400f..88bd990 100644
--- a/activemq-native/README
+++ b/activemq-native/README
@@ -1,5 +1,5 @@
 
-This is a simple tutorial on compiling libHornetQLibAIO.so
+This is a simple tutorial on compiling libActiveMQLibAIO.so
 
 DEPENDENCIES
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
----------------------------------------------------------------------
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/package.html b/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
index 0eb7e73..eda0590 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/package.html
@@ -18,7 +18,7 @@ Copyright 2009 Red Hat, Inc.
   </head>
 
   <body bgcolor="white">
-    <h1>HornetQ Resource Adaptor</h1>
+    <h1>ActiveMQ Resource Adaptor</h1>
 
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
index 063e71c..9288bf7 100644
--- a/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
+++ b/activemq-rest/src/main/resources/schema/hornetq-rest.xsd
@@ -8,8 +8,8 @@
                 <xsd:element name="server-in-vm-id" type="xsd:string" minOccurs="0" maxOccurs="1">
                     <xsd:annotation>
                         <xsd:documentation>
-                            The HornetQ REST implementation uses the IN-VM transport to communicate
-                            with HornetQ. It uses the default server id, which is "0".
+                            The ActiveMQ REST implementation uses the IN-VM transport to communicate
+                            with ActiveMQ. It uses the default server id, which is "0".
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:element>
@@ -17,7 +17,7 @@
                     <xsd:annotation>
                         <xsd:documentation>
                             By default, all links (URLs) are published using custom headers.
-                            You can instead have the HornetQ REST implementation publish links
+                            You can instead have the ActiveMQ REST implementation publish links
                             using the Link Header specification instead if you desire.
                         </xsd:documentation>
                     </xsd:annotation>
@@ -57,7 +57,7 @@
                 <xsd:element name="producer-session-pool-size" type="xsd:int" minOccurs="0" maxOccurs="1">
                     <xsd:annotation>
                         <xsd:documentation>
-                            The REST implementation pools HornetQ sessions for sending messages.
+                            The REST implementation pools ActiveMQ sessions for sending messages.
                             This is the size of the pool. That number of sessions will be created
                             at startup time.
                         </xsd:documentation>
@@ -90,8 +90,8 @@
                 <xsd:element name="consumer-window-size" type="xsd:int" minOccurs="0" maxOccurs="1">
                     <xsd:annotation>
                         <xsd:documentation>
-                            For consumers, this config option is the same as the HornetQ one of the
-                            same name. It will be used by sessions created by the HornetQ REST
+                            For consumers, this config option is the same as the ActiveMQ one of the
+                            same name. It will be used by sessions created by the ActiveMQ REST
                             implementation.
                         </xsd:documentation>
                     </xsd:annotation>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security b/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security
index fd7afc1..84138b4 100644
--- a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security
+++ b/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security
@@ -10,4 +10,4 @@
 ## implied.  See the License for the specific language governing
 ## permissions and limitations under the License.
 ## ---------------------------------------------------------------------------
-class=org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl
\ No newline at end of file
+class=org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/distribution/activemq/src/main/resources/config/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties
index 1d05222..e905257 100644
--- a/distribution/activemq/src/main/resources/config/logging.properties
+++ b/distribution/activemq/src/main/resources/config/logging.properties
@@ -26,7 +26,7 @@ loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.ut
 
 # Root logger level
 logger.level=INFO
-# HornetQ logger levels
+# ActiveMQ logger levels
 logger.org.apache.activemq.core.server.level=INFO
 logger.org.apache.activemq.journal.level=INFO
 logger.org.apache.activemq.utils.level=INFO

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/README.html
----------------------------------------------------------------------
diff --git a/docs/README.html b/docs/README.html
index eca86ff..852a0ec 100644
--- a/docs/README.html
+++ b/docs/README.html
@@ -3,20 +3,20 @@
 <head>
    <meta content="text/html; charset=ISO-8859-1"
          http-equiv="content-type">
-   <title>HornetQ 2.4.1.Final Release Notes</title>
+   <title>ActiveMQ 2.4.1.Final Release Notes</title>
 </head>
 <body>
 
-<h1>Release Notes - HornetQ - Version 2.4.1 Final</h1>
+<h1>Release Notes - ActiveMQ - Version 2.4.1 Final</h1>
 
 <br>
 
 <h2>22th January 2014</h2>
 
-These are the release notes for HornetQ 2.4.1.Final<br><br>
+These are the release notes for ActiveMQ 2.4.1.Final<br><br>
 
 For full description of the contents please see the
-<a href="https://issues.jboss.org/secure/ReleaseNote.jspa?version=12323863&styleName=Html&projectId=12310830&Create=Create&atl_token=AQZJ-FV3A-N91S-UDEU|b93a9de57630404d8d3e4728027e899036f5eaab|lout">HornetQ project JIRA</a>.<br><br>
+<a href="https://issues.jboss.org/secure/ReleaseNote.jspa?version=12323863&styleName=Html&projectId=12310830&Create=Create&atl_token=AQZJ-FV3A-N91S-UDEU|b93a9de57630404d8d3e4728027e899036f5eaab|lout">ActiveMQ project JIRA</a>.<br><br>
 
 2.4.1.Final is a patch release built on 2.4.0.Final.
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/Author_Group.xml b/docs/design-guide/en/Author_Group.xml
index 2d9b1bd..be61528 100644
--- a/docs/design-guide/en/Author_Group.xml
+++ b/docs/design-guide/en/Author_Group.xml
@@ -13,7 +13,7 @@
   -->
 
 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <authorgroup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/Book_Info.xml b/docs/design-guide/en/Book_Info.xml
index 43d56b6..8eb04bd 100644
--- a/docs/design-guide/en/Book_Info.xml
+++ b/docs/design-guide/en/Book_Info.xml
@@ -13,17 +13,17 @@
   -->
 
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<bookinfo id="HornetQ_QuickStart_Guide">
-  <title>HornetQ Design Guide</title>
+<bookinfo id="ActiveMQ_QuickStart_Guide">
+  <title>ActiveMQ Design Guide</title>
   <subtitle>Putting the buzz in messaging</subtitle>
-  <productname>HornetQ</productname>
+  <productname>ActiveMQ</productname>
   <edition>2.1.0</edition>
   <pubsnumber>1</pubsnumber>
   <abstract>
-    <para>This Design guide is to help current and future developers how HornetQ's architectures are designed to
+    <para>This Design guide is to help current and future developers how ActiveMQ's architectures are designed to
     help the future development and maintenance of the project</para>
   </abstract>
   <corpauthor>
@@ -32,7 +32,7 @@
         <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
       </imageobject>
       <textobject>
-        <phrase>HornetQ Logo</phrase>
+        <phrase>ActiveMQ Logo</phrase>
       </textobject>
     </inlinemediaobject>
   </corpauthor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/HornetQ_Design_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/HornetQ_Design_Guide.ent b/docs/design-guide/en/HornetQ_Design_Guide.ent
index e77312f..004902c 100644
--- a/docs/design-guide/en/HornetQ_Design_Guide.ent
+++ b/docs/design-guide/en/HornetQ_Design_Guide.ent
@@ -1,5 +1,5 @@
-<!ENTITY PRODUCT "HornetQ">
-<!ENTITY BOOKID "HornetQ_Design_Guide">
+<!ENTITY PRODUCT "ActiveMQ">
+<!ENTITY BOOKID "ActiveMQ_Design_Guide">
 <!ENTITY YEAR "2011">
 <!ENTITY HOLDER "Red Hat Inc.">
 <!ENTITY semi ";">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/HornetQ_Design_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/HornetQ_Design_Guide.xml b/docs/design-guide/en/HornetQ_Design_Guide.xml
index 255c25d..d498275 100644
--- a/docs/design-guide/en/HornetQ_Design_Guide.xml
+++ b/docs/design-guide/en/HornetQ_Design_Guide.xml
@@ -14,7 +14,7 @@
   -->
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 
 ]>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/about.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/about.xml b/docs/design-guide/en/about.xml
index 4542d0d..fb05022 100644
--- a/docs/design-guide/en/about.xml
+++ b/docs/design-guide/en/about.xml
@@ -14,11 +14,11 @@
   -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 
 <chapter id="about">
-   <title>About HornetQ</title>
-    <para>What is HornetQ?</para>
+   <title>About ActiveMQ</title>
+    <para>What is ActiveMQ?</para>
 </chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/clustering.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/clustering.xml b/docs/design-guide/en/clustering.xml
index 18428f6..e9486e4 100644
--- a/docs/design-guide/en/clustering.xml
+++ b/docs/design-guide/en/clustering.xml
@@ -18,7 +18,7 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="introduction">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/en/notice.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/notice.xml b/docs/design-guide/en/notice.xml
index 5d75298..e85f997 100644
--- a/docs/design-guide/en/notice.xml
+++ b/docs/design-guide/en/notice.xml
@@ -12,7 +12,7 @@
   -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_Design_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/design-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/pom.xml b/docs/design-guide/pom.xml
index 4c4b6ff..bf93b0a 100644
--- a/docs/design-guide/pom.xml
+++ b/docs/design-guide/pom.xml
@@ -25,8 +25,8 @@
 
   <properties>
     <translation>en</translation>
-    <docname>HornetQ_Design_Guide</docname>
-    <bookname>HornetQ Design Guide</bookname>
+    <docname>ActiveMQ_Design_Guide</docname>
+    <bookname>ActiveMQ Design Guide</bookname>
   </properties> 
 
   <repositories>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/en/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/Author_Group.xml b/docs/eap-manual/en/Author_Group.xml
index 67034ea..3abd330 100644
--- a/docs/eap-manual/en/Author_Group.xml
+++ b/docs/eap-manual/en/Author_Group.xml
@@ -13,7 +13,7 @@
   -->
 
 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
 %BOOK_ENTITIES;
 ]>
 <authorgroup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/en/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/Book_Info.xml b/docs/eap-manual/en/Book_Info.xml
index 869f4ba..b4bf01b 100644
--- a/docs/eap-manual/en/Book_Info.xml
+++ b/docs/eap-manual/en/Book_Info.xml
@@ -14,17 +14,17 @@
 
 <!-- This document was created with Syntext Serna Free. -->
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
 %BOOK_ENTITIES;
 ]>
-<bookinfo id="HornetQ_EAP_Manual">
-  <title>HornetQ Eap Manual</title>
+<bookinfo id="ActiveMQ_EAP_Manual">
+  <title>ActiveMQ Eap Manual</title>
   <subtitle>Putting the buzz in messaging</subtitle>
-  <productname>HornetQ</productname>
+  <productname>ActiveMQ</productname>
   <edition>2.1.0</edition>
   <pubsnumber>1</pubsnumber>
   <abstract>
-    <para>This is a guide to using HornetQ within EAP</para>
+    <para>This is a guide to using ActiveMQ within EAP</para>
   </abstract>
   <corpauthor>
     <inlinemediaobject>
@@ -32,7 +32,7 @@
         <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
       </imageobject>
       <textobject>
-        <phrase>HornetQ Logo</phrase>
+        <phrase>ActiveMQ Logo</phrase>
       </textobject>
     </inlinemediaobject>
   </corpauthor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/en/HornetQ_EAP_Manual.ent
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/HornetQ_EAP_Manual.ent b/docs/eap-manual/en/HornetQ_EAP_Manual.ent
index 1c0d787..c757b83 100644
--- a/docs/eap-manual/en/HornetQ_EAP_Manual.ent
+++ b/docs/eap-manual/en/HornetQ_EAP_Manual.ent
@@ -1,5 +1,5 @@
-<!ENTITY PRODUCT "HornetQ">
-<!ENTITY BOOKID "HornetQ_EAP_Manual">
+<!ENTITY PRODUCT "ActiveMQ">
+<!ENTITY BOOKID "ActiveMQ_EAP_Manual">
 <!ENTITY YEAR "2011">
 <!ENTITY HOLDER "Red Hat Inc.">
 <!ENTITY semi ";">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/en/HornetQ_EAP_Manual.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/HornetQ_EAP_Manual.xml b/docs/eap-manual/en/HornetQ_EAP_Manual.xml
index 296057b..32e5749 100644
--- a/docs/eap-manual/en/HornetQ_EAP_Manual.xml
+++ b/docs/eap-manual/en/HornetQ_EAP_Manual.xml
@@ -14,7 +14,7 @@
 
 <!-- This document was created with Syntext Serna Free. -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
 %BOOK_ENTITIES;
 
 ]>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/en/clusters.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml
index ed85215..1f71cc6 100644
--- a/docs/eap-manual/en/clusters.xml
+++ b/docs/eap-manual/en/clusters.xml
@@ -14,14 +14,14 @@
   -->
 
 <chapter id="clusters">
-   <title>HornetQ and EAP Cluster Configuration</title>
+   <title>ActiveMQ and EAP Cluster Configuration</title>
    <section>
       <title>Configuring Failover</title>
       <para>
-         This chapter explains how to configure HornetQ within EAP with live backup-groups. Currently in this version
-         HornetQ only supports shared store for backup nodes so we assume that in the rest of this chapter.
+         This chapter explains how to configure ActiveMQ within EAP with live backup-groups. Currently in this version
+         ActiveMQ only supports shared store for backup nodes so we assume that in the rest of this chapter.
       </para>
-      <para>There are 2 main ways to configure HornetQ servers to have a backup server:</para>
+      <para>There are 2 main ways to configure ActiveMQ servers to have a backup server:</para>
       <itemizedlist>
          <listitem>
             <para>Colocated. This is when an EAP instance has both a live and backup(s) running.</para>
@@ -206,7 +206,7 @@
                   are created from the Journal when the backup server becomes live.
                </para>
                <para>
-                  Firstly we need to define a new HornetQ Server that EAP will deploy. We do this by creating a new
+                  Firstly we need to define a new ActiveMQ Server that EAP will deploy. We do this by creating a new
                   <literal>hornetq-jboss-beans.xml</literal>
                   configuration. We will place this under a new directory
                   <literal>hornetq-backup1</literal>
@@ -228,7 +228,7 @@
 
 
       &lt;!-- The core server -->
-      &lt;bean name="BackupHornetQServer" class="org.apache.activemq.core.server.impl.HornetQServerImpl">
+      &lt;bean name="BackupActiveMQServer" class="org.apache.activemq.core.server.impl.ActiveMQServerImpl">
          &lt;constructor>
             &lt;parameter>
                &lt;inject bean="BackupConfiguration"/>
@@ -237,7 +237,7 @@
                &lt;inject bean="MBeanServer"/>
             &lt;/parameter>
             &lt;parameter>
-               &lt;inject bean="HornetQSecurityManager"/>
+               &lt;inject bean="ActiveMQSecurityManager"/>
             &lt;/parameter>
          &lt;/constructor>
          &lt;start ignored="true"/>
@@ -248,7 +248,7 @@
       &lt;bean name="BackupJMSServerManager" class="org.apache.activemq.jms.server.impl.JMSServerManagerImpl">
          &lt;constructor>
             &lt;parameter>
-               &lt;inject bean="BackupHornetQServer"/>
+               &lt;inject bean="BackupActiveMQServer"/>
             &lt;/parameter>
          &lt;/constructor>
       &lt;/bean>
@@ -263,7 +263,7 @@
                   server which we will place in the same directory.
                </para>
                <para>
-                  After that we just configure a new HornetQ Server and JMS server.
+                  After that we just configure a new ActiveMQ Server and JMS server.
                </para>
                <note>
                   <para>
@@ -386,7 +386,7 @@
                   The second thing you can see is we have added a
                   <literal>jmx-domain</literal>
                   attribute, this is used when
-                  adding objects, such as the HornetQ server and JMS server to jmx, we change this from the default
+                  adding objects, such as the ActiveMQ server and JMS server to jmx, we change this from the default
                   <literal>org.apache.activemq</literal>
                   to avoid naming clashes with the live server
                </para>
@@ -429,7 +429,7 @@
                </para>
                <para>
                   The Broadcast groups, Discovery group and cluster configurations are as per normal, details of these
-                  can be found in the HornetQ user manual.
+                  can be found in the ActiveMQ user manual.
                </para>
                <note>
                   <para>notice the commented out <literal>max-hops</literal> in the cluster connection, set this to 0 if
@@ -480,7 +480,7 @@
             <graphic fileref="images/simple-dedicated.jpg" align="center" format="jpg" scale="30"/>
         </para>
          <para>
-            Here you can see how this works with remote JMS clients. Once failover occurs the HornetQ backup Server takes
+            Here you can see how this works with remote JMS clients. Once failover occurs the ActiveMQ backup Server takes
             running within another eap instance takes over as live.
          </para>
          <para>
@@ -495,7 +495,7 @@
             makes no sense to host any applications in it. However you can host applications on the server running the live
             hornetq server. If failure occurs to an live hornetq server then remote jms clients will failover as previously
             explained however what happens to any messages meant for or sent from JEE components. Well when the backup comes
-            live, messages will be distributed to and from the backup server over HornetQ cluster connections and handled
+            live, messages will be distributed to and from the backup server over ActiveMQ cluster connections and handled
             appropriately.
          </para>
          <para>
@@ -506,7 +506,7 @@
             <graphic fileref="images/simple-dedicated-jca-remote.jpg" align="center" format="jpg" scale="30"/>
          </para>
          <para>
-            Here you can see that all the Application (via JCA) will be serviced by a HornetQ server in its own eap instance.
+            Here you can see that all the Application (via JCA) will be serviced by a ActiveMQ server in its own eap instance.
          </para>
          <section>
             <title>Configuration of dedicated Live and backup</title>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/eap-manual/pom.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/pom.xml b/docs/eap-manual/pom.xml
index 4c85f52..b1f5563 100644
--- a/docs/eap-manual/pom.xml
+++ b/docs/eap-manual/pom.xml
@@ -25,8 +25,8 @@
 
   <properties>
     <translation>en</translation>
-    <docname>HornetQ_EAP_Manual</docname>
-    <bookname>HornetQ EAP Manual</bookname>
+    <docname>ActiveMQ_EAP_Manual</docname>
+    <bookname>ActiveMQ EAP Manual</bookname>
   </properties> 
 
   <repositories>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/Author_Group.xml b/docs/quickstart-guide/en/Author_Group.xml
index b0dac5f..43a10c3 100644
--- a/docs/quickstart-guide/en/Author_Group.xml
+++ b/docs/quickstart-guide/en/Author_Group.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <authorgroup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/Book_Info.xml b/docs/quickstart-guide/en/Book_Info.xml
index 5f2ce4b..22a9c62 100644
--- a/docs/quickstart-guide/en/Book_Info.xml
+++ b/docs/quickstart-guide/en/Book_Info.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<bookinfo id="HornetQ_QuickStart_Guide">
-  <title>HornetQ QuickStart Guide</title>
+<bookinfo id="ActiveMQ_QuickStart_Guide">
+  <title>ActiveMQ QuickStart Guide</title>
   <subtitle>Putting the buzz in messaging</subtitle>
-  <productname>HornetQ</productname>
+  <productname>ActiveMQ</productname>
   <edition>2.1.0</edition>
   <pubsnumber>1</pubsnumber>
   <abstract>
-    <para>This Quickstart guide will help you get HornetQ up and running in a few minutes and will explain the basics needed
+    <para>This Quickstart guide will help you get ActiveMQ up and running in a few minutes and will explain the basics needed
     to get started.</para>
   </abstract>
   <corpauthor>
@@ -19,7 +19,7 @@
         <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
       </imageobject>
       <textobject>
-        <phrase>HornetQ Logo</phrase>
+        <phrase>ActiveMQ Logo</phrase>
       </textobject>
     </inlinemediaobject>
   </corpauthor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent b/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
index f3d2b4a..2d68887 100644
--- a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
+++ b/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
@@ -1,5 +1,5 @@
-<!ENTITY PRODUCT "HornetQ">
-<!ENTITY BOOKID "HornetQ_QuickStart_Guide">
+<!ENTITY PRODUCT "ActiveMQ">
+<!ENTITY BOOKID "ActiveMQ_QuickStart_Guide">
 <!ENTITY YEAR "2011">
 <!ENTITY HOLDER "Red Hat Inc.">
 <!ENTITY semi ";">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml b/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
index 62114fa..0dac31a 100644
--- a/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
+++ b/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 
 ]>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/about.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/about.xml b/docs/quickstart-guide/en/about.xml
index b55905c..7d44cdf 100644
--- a/docs/quickstart-guide/en/about.xml
+++ b/docs/quickstart-guide/en/about.xml
@@ -19,32 +19,32 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 
 <chapter id="about">
-   <title>About HornetQ</title>
-    <para>What is HornetQ?</para>
+   <title>About ActiveMQ</title>
+    <para>What is ActiveMQ?</para>
     <itemizedlist>
         <listitem>
-            <para>HornetQ is an open source project to build a multi-protocol, embeddable, very high
+            <para>ActiveMQ is an open source project to build a multi-protocol, embeddable, very high
                 performance, clustered, asynchronous messaging system.</para>
         </listitem>
         <listitem>
-            <para>For answers to more questions about what HornetQ is and what it isn't please visit
-                the <ulink url="http://www.jboss.org/community/wiki/HornetQGeneralFAQs">FAQs wiki
+            <para>For answers to more questions about what ActiveMQ is and what it isn't please visit
+                the <ulink url="http://www.jboss.org/community/wiki/ActiveMQGeneralFAQs">FAQs wiki
                     page</ulink>.</para>
         </listitem>
     </itemizedlist>
-    <para>Why use HornetQ? Here are just a few of the reasons:</para>
+    <para>Why use ActiveMQ? Here are just a few of the reasons:</para>
     <itemizedlist>
         <listitem>
-            <para>100% open source software. HornetQ is licenced using the Apache Software License v2.0
+            <para>100% open source software. ActiveMQ is licenced using the Apache Software License v2.0
                 to minimise barriers to adoption.</para>
         </listitem>
         <listitem>
-            <para>HornetQ is designed with usability in mind.</para>
+            <para>ActiveMQ is designed with usability in mind.</para>
         </listitem>
         <listitem>
             <para>Written in Java. Runs on any platform with a Java 6+ runtime, that's everything
@@ -60,7 +60,7 @@
                 and others you won't find anywhere else.</para>
         </listitem>
         <listitem>
-            <para>Elegant, clean-cut design with minimal third party dependencies. Run HornetQ
+            <para>Elegant, clean-cut design with minimal third party dependencies. Run ActiveMQ
                 stand-alone, run it in integrated in your favourite JEE application server, or run
                 it embedded inside your own product. It's up to you.</para>
         </listitem>
@@ -77,7 +77,7 @@
         </listitem>
         <listitem>
             <para>For a full list of features, please see the <ulink
-                url="http://www.jboss.org/community/wiki/HornetQFeatures">features wiki
+                url="http://www.jboss.org/community/wiki/ActiveMQFeatures">features wiki
                 page</ulink> .</para>
         </listitem>
     </itemizedlist>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/download.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/download.xml b/docs/quickstart-guide/en/download.xml
index bc0beec..7eeecb8 100644
--- a/docs/quickstart-guide/en/download.xml
+++ b/docs/quickstart-guide/en/download.xml
@@ -18,12 +18,12 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="download">
    <title>Download</title>
-   <para>The official HornetQ project page is <ulink url="http://hornetq.org/"
+   <para>The official ActiveMQ project page is <ulink url="http://hornetq.org/"
          >http://hornetq.org/</ulink>.</para>
    <section id="download.software">
       <title>Software Download</title>
@@ -37,7 +37,7 @@
          <itemizedlist>
             <listitem>
                <para>Please take a look at our project <ulink
-                     url="http://www.jboss.org/community/wiki/HornetQ">wiki</ulink></para>
+                     url="http://www.jboss.org/community/wiki/ActiveMQ">wiki</ulink></para>
             </listitem>
             <listitem>
                <para>If you have any user questions please use our <ulink
@@ -60,7 +60,7 @@
                <para>Follow us on <ulink url="http://twitter.com/hornetq">twitter</ulink></para>
             </listitem>
             <listitem>
-               <para>HornetQ Git repository is <ulink
+               <para>ActiveMQ Git repository is <ulink
                      url="https://github.com/hornetq/hornetq"
                      >https://github.com/hornetq/hornetq</ulink></para>
             </listitem>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/examples.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/examples.xml b/docs/quickstart-guide/en/examples.xml
index 057aa27..7574664 100644
--- a/docs/quickstart-guide/en/examples.xml
+++ b/docs/quickstart-guide/en/examples.xml
@@ -18,7 +18,7 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="examples">
@@ -66,7 +66,7 @@
 [INFO] Scanning for projects...
 [INFO]
 [INFO] ------------------------------------------------------------------------
-[INFO] Building HornetQ JMS Queue Example 2.3.0.BETA-SNAPSHOT
+[INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT
 [INFO] ------------------------------------------------------------------------
 [INFO]
 [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jms-queue-example ---
@@ -106,29 +106,29 @@
 [file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/]
 Apr 17, 2013 10:51:01 AM org.apache.activemq.core.deployers.impl.FileConfigurationParser parseMainConfig
 WARN: HQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal
-Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl start
-INFO: HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging)
-Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
+Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start
+INFO: HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging)
+Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
 INFO: HQ221006: Waiting to obtain live lock
 Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager &lt;init>
 INFO: HQ221013: Using NIO Journal
-Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.HornetQServerImpl initialisePart1
-WARN: HQ222007: Security risk! HornetQ is running with the default cluster admin user and default password. Please see the HornetQ user guide, cluster chapter, for instructions on how to change this.
+Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl initialisePart1
+WARN: HQ222007: Security risk! ActiveMQ is running with the default cluster admin user and default password. Please see the ActiveMQ user guide, cluster chapter, for instructions on how to change this.
 Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode
 INFO: HQ221034: Waiting to obtain live lock
 Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.FileLockNodeManager startLiveNode
 INFO: HQ221035: Live Server Obtained live lock
-Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl deployQueue
+Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl deployQueue
 INFO: HQ221003: trying to deploy queue jms.queue.exampleQueue
 Apr 17, 2013 10:51:02 AM org.apache.activemq.core.remoting.impl.netty.NettyAcceptor start
 INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:5445 for CORE protocol
-Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
+Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
 INFO: HQ221007: Server is now live
-Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.HornetQServerImpl start
-INFO: HQ221001: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
+Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start
+INFO: HQ221001: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
 [INFO]
 [INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ hornetq-jms-queue-example ---
-Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.HornetQExample getContext
+Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext
 INFO: using jnp://localhost:1099 for jndi
 Sent message: This is a text message
 Received message: This is a text message
@@ -141,8 +141,8 @@ example complete
 [INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ hornetq-jms-queue-example ---
 Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop
 WARN: HQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor]
-Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.HornetQServerImpl stop
-INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped
+Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl stop
+INFO: HQ221002: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
@@ -152,7 +152,7 @@ INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57
 [INFO] ------------------------------------------------------------------------
 
 </programlisting>
-      <para>Congratulations! You have successfully run your first HornetQ example. Try some of the
+      <para>Congratulations! You have successfully run your first ActiveMQ example. Try some of the
          others.</para>
    </section>
    <section id="examples.messaging">
@@ -172,7 +172,7 @@ INFO: HQ221002: HornetQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57
 [INFO] Scanning for projects...
 [INFO]
 [INFO] ------------------------------------------------------------------------
-[INFO] Building HornetQ JEE MDB Example 2.3.0.BETA-SNAPSHOT
+[INFO] Building ActiveMQ JEE MDB Example 2.3.0.BETA-SNAPSHOT
 [INFO] ------------------------------------------------------------------------
 [INFO]
 [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jee-mdb-bmt-example ---
@@ -235,8 +235,8 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo
 10:58:05,831 INFO  [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA
 10:58:05,943 INFO  [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080
 10:58:05,966 INFO  [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started
-10:58:05,988 INFO  [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
-10:58:05,996 INFO  [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock
+10:58:05,988 INFO  [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging)
+10:58:05,996 INFO  [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock
 10:58:06,037 INFO  [org.apache.activemq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal
 10:58:06,122 INFO  [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started
 10:58:06,184 INFO  [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-7) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS]
@@ -247,16 +247,16 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo
 10:58:06,436 INFO  [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments
 10:58:08,790 INFO  [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol
 10:58:08,793 INFO  [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol
-10:58:08,795 INFO  [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) Server is now live
-10:58:08,797 INFO  [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-11) HornetQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
+10:58:08,795 INFO  [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Server is now live
+10:58:08,797 INFO  [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) ActiveMQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
 10:58:08,822 INFO  [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory
 10:58:08,824 INFO  [org.jboss.as.messaging] (MSC service thread 1-4) JBAS011601: Bound messaging object to jndi name java:/RemoteConnectionFactory
 10:58:08,825 INFO  [org.jboss.as.messaging] (MSC service thread 1-10) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
-10:58:08,830 INFO  [org.apache.activemq.core.server.impl.HornetQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue
+10:58:08,830 INFO  [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-3) trying to deploy queue jms.queue.testQueue
 10:58:08,836 INFO  [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:/queue/test
 10:58:08,840 INFO  [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/queues/testQueue
 10:58:08,859 INFO  [org.jboss.as.deployment.connector] (MSC service thread 1-9) JBAS010406: Registered connection factory java:/JmsXA
-10:58:08,866 INFO  [org.apache.activemq.ra.HornetQResourceAdapter] (MSC service thread 1-9) HornetQ resource adaptor started
+10:58:08,866 INFO  [org.apache.activemq.ra.ActiveMQResourceAdapter] (MSC service thread 1-9) ActiveMQ resource adaptor started
 10:58:08,867 INFO  [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatorhornetq-ra
 10:58:08,870 INFO  [org.jboss.as.deployment.connector] (MSC service thread 1-5) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA]
 10:58:08,898 INFO  [org.jboss.as.server.deployment] (MSC service thread 1-10) JBAS015876: Starting deployment of "ONT001-1.0.war"
@@ -303,8 +303,8 @@ mdb.jar:
 10:58:12,562 INFO  [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar"
 Sent message: This is a text message
 10:58:13,229 INFO  [org.jboss.as.naming] (Remoting "localhost" task-3) JBAS011806: Channel end notification received, closing channel Channel ID 57be4578 (inbound) of Remoting connection 3ac552d5 to /127.0.0.1:58571
-10:58:13,255 INFO  [stdout] (Thread-0 (HornetQ-client-global-threads-1402019528)) message This is a text message received
-10:58:13,257 INFO  [stdout] (Thread-0 (HornetQ-client-global-threads-1402019528)) we're in the middle of a transaction: org.jboss.tm.usertx.client.ServerVMClientUserTransaction@6b04d3c8
+10:58:13,255 INFO  [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) message This is a text message received
+10:58:13,257 INFO  [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) we're in the middle of a transaction: org.jboss.tm.usertx.client.ServerVMClientUserTransaction@6b04d3c8
 10:58:14,292 INFO  [org.jboss.as.server.deployment] (MSC service thread 1-5) JBAS015877: Stopped deployment mdb.jar in 33ms
 10:58:14,413 INFO  [org.jboss.as.repository] (management-handler-thread - 1) JBAS014901: Content removed from location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content
 10:58:14,415 INFO  [org.jboss.as.server] (management-handler-thread - 1) JBAS018558: Undeployed "mdb.jar"

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/installation.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/installation.xml b/docs/quickstart-guide/en/installation.xml
index 80d4844..91fe855 100644
--- a/docs/quickstart-guide/en/installation.xml
+++ b/docs/quickstart-guide/en/installation.xml
@@ -18,21 +18,21 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="installation">
    <title>Installation</title>
-   <para>This section describes how to install HornetQ. </para>
+   <para>This section describes how to install ActiveMQ. </para>
    <section id="installation.prerequisites">
       <title>Prerequisites</title>
       <note>
-         <para>HornetQ only runs on Java 7 or later.</para>
+         <para>ActiveMQ only runs on Java 7 or later.</para>
       </note>
-      <para>By default, HornetQ server runs with 1GiB of memory. If your computer has less memory,
+      <para>By default, ActiveMQ server runs with 1GiB of memory. If your computer has less memory,
          or you want to run it with more available RAM, modify the value in <literal
             >bin/run.sh</literal> accordingly.</para>
-      <para>For persistence, HornetQ uses its own fast journal, which you can configure to use
+      <para>For persistence, ActiveMQ uses its own fast journal, which you can configure to use
          libaio (which is the default when running on Linux) or Java NIO. In order to use the libaio
          module on Linux, you'll need to install libaio, if it's not already installed.</para>
       <para>If you're not running on Linux then you don't need to worry about this.</para>
@@ -43,7 +43,7 @@
       <programlisting>apt-get install libaio</programlisting>
    </section>
    <section id="installation.standalone">
-      <title>Stand-alone HornetQ Server</title>
+      <title>Stand-alone ActiveMQ Server</title>
       <para>After downloading the distribution, unzip it into your chosen directory. At this point
          it should be possible to <link linkend="running.standalone">run straight out of the
             box</link>, the following describes the directory structure: </para>
@@ -73,28 +73,28 @@
       </programlisting>
       <itemizedlist>
          <listitem>
-            <para><literal>bin</literal> -- binaries and scripts needed to run HornetQ.</para>
+            <para><literal>bin</literal> -- binaries and scripts needed to run ActiveMQ.</para>
          </listitem>
          <listitem>
-            <para><literal>config</literal> -- configuration files needed to configure HornetQ. This
-               contains configurations to run HornetQ either in stand-alone or inside JBoss AS 4 and 5.
+            <para><literal>config</literal> -- configuration files needed to configure ActiveMQ. This
+               contains configurations to run ActiveMQ either in stand-alone or inside JBoss AS 4 and 5.
                Please refer to the reference guide for details on configuration. </para>
          </listitem>
          <listitem>
-            <para><literal>docs</literal> -- guides and javadocs for HornetQ </para>
+            <para><literal>docs</literal> -- guides and javadocs for ActiveMQ </para>
          </listitem>
          <listitem>
             <para><literal>examples</literal> -- JMS and Java EE examples. Please refer to the
                'running examples' chapter for details on how to run them. </para>
          </listitem>
          <listitem>
-            <para><literal>lib</literal> -- jars and libraries needed to run HornetQ </para>
+            <para><literal>lib</literal> -- jars and libraries needed to run ActiveMQ </para>
          </listitem>
          <listitem>
-            <para><literal>licenses</literal> -- licenses for HornetQ </para>
+            <para><literal>licenses</literal> -- licenses for ActiveMQ </para>
          </listitem>
          <listitem>
-            <para><literal>schemas</literal> -- XML Schemas used to validate HornetQ configuration
+            <para><literal>schemas</literal> -- XML Schemas used to validate ActiveMQ configuration
                files</para>
          </listitem>
       </itemizedlist>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/introduction.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/introduction.xml b/docs/quickstart-guide/en/introduction.xml
index faded49..abd47bc 100644
--- a/docs/quickstart-guide/en/introduction.xml
+++ b/docs/quickstart-guide/en/introduction.xml
@@ -18,15 +18,15 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="introduction">
     <title>Getting Started</title>
     <para>This short guide explains how to download, install and quickly get started with
-        HornetQ.</para>
+        ActiveMQ.</para>
     <para>After downloading and installing we highly recommend you run the examples to get
-        acquainted with HornetQ. We ship with over 70 examples demonstrating most of the
+        acquainted with ActiveMQ. We ship with over 70 examples demonstrating most of the
         features.</para>
     <para>This guide is not intended to be a replacement for the user manual. The user manual goes
         into much more depth, so please consult that for further information.</para>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/notice.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/notice.xml b/docs/quickstart-guide/en/notice.xml
index f5c5f05..d8796f5 100644
--- a/docs/quickstart-guide/en/notice.xml
+++ b/docs/quickstart-guide/en/notice.xml
@@ -17,7 +17,7 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/en/running.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/running.xml b/docs/quickstart-guide/en/running.xml
index 56333e9..826c514 100644
--- a/docs/quickstart-guide/en/running.xml
+++ b/docs/quickstart-guide/en/running.xml
@@ -18,24 +18,24 @@
 <!-- ============================================================================= -->
 
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_QuickStart_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="running">
    <title>Starting The Server</title>
    <section id="running.standalone">
-      <title>Standalone HornetQ</title>
+      <title>Standalone ActiveMQ</title>
       <para>To run a stand-alone server, open up a shell or command prompt and navigate into the
             <literal>bin</literal> directory. Then execute <literal>./hornetq run</literal> (or <literal
             >./hornetq.cmd run</literal> on Windows) and you should see the following output </para>
       <programlisting>
          bin$ ./hornetq run
 
-         11:05:06,589 INFO  [org.apache.activemq.integration.bootstrap] HQ101000: Starting HornetQ Server
+         11:05:06,589 INFO  [org.apache.activemq.integration.bootstrap] HQ101000: Starting ActiveMQ Server
          ...
-         11:05:10,848 INFO  [org.apache.activemq.core.server] HQ221001: HornetQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3]
+         11:05:10,848 INFO  [org.apache.activemq.core.server] HQ221001: ActiveMQ Server version 2.5.0.SNAPSHOT (Wild Hornet, 125) [e32ae252-52ee-11e4-a716-7785dc3013a3]
       </programlisting>
-      <para>HornetQ is now running.</para>
+      <para>ActiveMQ is now running.</para>
       <para>Both the run and the stop scripts use the config under <literal
             >config/non-clustered</literal> by default. The configuration can be changed
          by running <literal>./hornetq run xml:../config/non-clustered/bootstrap.xml</literal> or another config of
@@ -43,8 +43,8 @@
       <para>The server can be stopped by running <literal>./hornetq stop</literal></para>
    </section>
    <section id="running.jboss.Wildfly">
-      <title>HornetQ In Wildfly</title>
-      <para>HornetQ is the Default Messaging Provider in the <ulink
+      <title>ActiveMQ In Wildfly</title>
+      <para>ActiveMQ is the Default Messaging Provider in the <ulink
               url="http://www.wildfly.org/" >Wildfly Application Server</ulink>
       To run the server you need to run the standalone-full.xml configuration by running the command './standalone.sh -c standalone-full.xml'.
           You will see something like:/</para>
@@ -89,7 +89,7 @@
           14:47:42,471 INFO  [org.wildfly.extension.undertow] (MSC service thread 1-7) JBAS017519: Undertow HTTP listener default listening on /127.0.0.1:8080
           14:47:42,823 INFO  [org.jboss.as.server.deployment.scanner] (MSC service thread 1-10) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/deployments
           14:47:42,882 INFO  [org.jboss.as.remoting] (MSC service thread 1-16) JBAS017100: Listening on 127.0.0.1:9999
-          14:47:43,037 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration HornetQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging)
+          14:47:43,037 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/wildfly/build/target/wildfly-8.0.0.Beta1-SNAPSHOT/standalone/data/messagingpaging)
           14:47:43,062 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221006: Waiting to obtain live lock
           14:47:43,103 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221012: Using AIO Journal
           14:47:43,313 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ224067: Adding protocol support CORE
@@ -107,12 +107,12 @@
           14:47:44,362 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol
           14:47:44,364 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:5445 for CORE protocol
           14:47:44,366 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live
-          14:47:44,366 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221001: HornetQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a]
+          14:47:44,366 INFO  [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221001: ActiveMQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a]
           14:47:44,435 INFO  [org.jboss.as.messaging] (ServerService Thread Pool -- 58) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
           14:47:44,437 INFO  [org.jboss.as.messaging] (ServerService Thread Pool -- 59) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/ServletConnectionFactory
           14:47:44,439 INFO  [org.jboss.as.messaging] (ServerService Thread Pool -- 60) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory
           14:47:44,462 INFO  [org.jboss.as.connector.deployment] (MSC service thread 1-3) JBAS010406: Registered connection factory java:/JmsXA
-          14:47:44,531 INFO  [org.apache.activemq.ra] (MSC service thread 1-3) HornetQ resource adaptor started
+          14:47:44,531 INFO  [org.apache.activemq.ra] (MSC service thread 1-3) ActiveMQ resource adaptor started
           14:47:44,532 INFO  [org.jboss.as.connector.services.resourceadapters.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-3) IJ020002: Deployed: file://RaActivatorhornetq-ra
           14:47:44,535 INFO  [org.jboss.as.connector.deployment] (MSC service thread 1-12) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA]
           14:47:44,536 INFO  [org.jboss.as.messaging] (MSC service thread 1-15) JBAS011601: Bound messaging object to jndi name java:jboss/DefaultJMSConnectionFactory

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/pom.xml b/docs/quickstart-guide/pom.xml
index c8ffe38..932d813 100644
--- a/docs/quickstart-guide/pom.xml
+++ b/docs/quickstart-guide/pom.xml
@@ -19,8 +19,8 @@
 
   <properties>
     <translation>en</translation>
-    <docname>HornetQ_QuickStart_Guide</docname>
-    <bookname>HornetQ QuickStart Guide</bookname>
+    <docname>ActiveMQ_QuickStart_Guide</docname>
+    <bookname>ActiveMQ QuickStart Guide</bookname>
   </properties>
 
   <repositories>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/zh/about.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/zh/about.xml b/docs/quickstart-guide/zh/about.xml
index 393d60b..1022aa1 100644
--- a/docs/quickstart-guide/zh/about.xml
+++ b/docs/quickstart-guide/zh/about.xml
@@ -19,25 +19,25 @@
 <!-- ============================================================================= -->
 
 <chapter id="about">
-   <title>关于HornetQ</title>
-    <para>什么是HornetQ?</para>
+   <title>关于ActiveMQ</title>
+    <para>什么是ActiveMQ?</para>
     <itemizedlist>
         <listitem>
-            <para>HornetQ是一个开源项目。它的目标是一个多协议、可嵌入、高性能、可集群的异步的消息系统。</para>
+            <para>ActiveMQ是一个开源项目。它的目标是一个多协议、可嵌入、高性能、可集群的异步的消息系统。</para>
         </listitem>
         <listitem>
-            <para>有关HornetQ是什么及不是什么的更多的问题,请访问
-                <ulink url="http://www.jboss.org/community/wiki/HornetQGeneralFAQs">FAQs wiki
+            <para>有关ActiveMQ是什么及不是什么的更多的问题,请访问
+                <ulink url="http://www.jboss.org/community/wiki/ActiveMQGeneralFAQs">FAQs wiki
                     页</ulink>。</para>
         </listitem>
     </itemizedlist>
-    <para>为什么要使用HornetQ? 以下给出了几个理由:</para>
+    <para>为什么要使用ActiveMQ? 以下给出了几个理由:</para>
     <itemizedlist>
         <listitem>
-            <para>HornetQ是100%的开源软件。 HornetQ 采用 Apache v 2.0开源协议,对用户的限制最小。</para>
+            <para>ActiveMQ是100%的开源软件。 ActiveMQ 采用 Apache v 2.0开源协议,对用户的限制最小。</para>
         </listitem>
         <listitem>
-            <para>HornetQ的设计强调可用性。</para>
+            <para>ActiveMQ的设计强调可用性。</para>
         </listitem>
         <listitem>
             <para>采用Java语言编写。可以在任何Java 6+ 的平台上运行。这几乎包括了从Windows到IBM mainframes的每个平台。</para>
@@ -49,11 +49,11 @@
             <para>功能全面。不仅拥有其它成熟消息产品所具有的全部功能,而且还有很多独特的功能。</para>
         </listitem>
         <listitem>
-            <para>HornetQ的设计遵从了简约的原则。对第三方软件的依赖极少。根据不同的需要,
-                  HornetQ可以单独运行,也可以运行于JEE应用服务器中。它还可以嵌入到你自己的应用程序中。</para>
+            <para>ActiveMQ的设计遵从了简约的原则。对第三方软件的依赖极少。根据不同的需要,
+                  ActiveMQ可以单独运行,也可以运行于JEE应用服务器中。它还可以嵌入到你自己的应用程序中。</para>
         </listitem>
         <listitem>
-            <para>完美的可获得性。HornetQ提供自动客户端失效备援(automatic client failover)功能,能保证在服务器故障时没有消息丢失或消息重复。</para>
+            <para>完美的可获得性。ActiveMQ提供自动客户端失效备援(automatic client failover)功能,能保证在服务器故障时没有消息丢失或消息重复。</para>
         </listitem>
         <listitem>
             <para>超级灵活的集群方案。可以控制集群进行消息负载均衡的方式。分布在不同地理位置的各个集群间可以通过非可靠的网络连接形成一个全球网络。
@@ -61,7 +61,7 @@
         </listitem>
         <listitem>
             <para>请访问 <ulink
-                url="http://www.jboss.org/community/wiki/HornetQFeatures">wiki</ulink>来全面了解HornetQ的所有功能介绍。</para>
+                url="http://www.jboss.org/community/wiki/ActiveMQFeatures">wiki</ulink>来全面了解ActiveMQ的所有功能介绍。</para>
         </listitem>
     </itemizedlist>
 </chapter>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4a6b980f/docs/quickstart-guide/zh/download.xml
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/zh/download.xml b/docs/quickstart-guide/zh/download.xml
index a15a51a..c1575e5 100644
--- a/docs/quickstart-guide/zh/download.xml
+++ b/docs/quickstart-guide/zh/download.xml
@@ -18,11 +18,11 @@
 <!-- ============================================================================= -->
 <chapter id="download">
    <title>下载</title>
-   <para>HornetQ项目的官方地址是 <ulink url="http://hornetq.org/"
+   <para>ActiveMQ项目的官方地址是 <ulink url="http://hornetq.org/"
          >http://hornetq.org/</ulink>。</para>
    <section id="download.software">
       <title>软件下载</title>
-      <para>HornetQ的下载地址是<ulink
+      <para>ActiveMQ的下载地址是<ulink
             url="http://hornetq.org/downloads.html/"
          >http://hornetq.org/downloads.html</ulink></para>
    </section>
@@ -31,11 +31,11 @@
       <para>
          <itemizedlist>
             <listitem>
-               <para>HornetQ的 <ulink
-                     url="http://www.jboss.org/community/wiki/HornetQ">wiki</ulink></para>
+               <para>ActiveMQ的 <ulink
+                     url="http://www.jboss.org/community/wiki/ActiveMQ">wiki</ulink></para>
             </listitem>
             <listitem>
-               <para>如果在使用HornetQ中发生任何问题,可以去我们的 <ulink
+               <para>如果在使用ActiveMQ中发生任何问题,可以去我们的 <ulink
                      url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&amp;f=312">用户论坛
                      </ulink></para>
             </listitem>
@@ -55,7 +55,7 @@
                <para>还可以跟踪我们的<ulink url="http://twitter.com/hornetq">twitter</ulink></para>
             </listitem>
             <listitem>
-               <para>HornetQ的Git代码库地址 <ulink
+               <para>ActiveMQ的Git代码库地址 <ulink
                      url="https://github.com/hornetq/hornetq"
                      >https://github.com/hornetq/hornetq</ulink></para>
             </listitem>


Mime
View raw message