activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [19/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:24 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/rest.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md
index 5ed5734..a8a990d 100644
--- a/docs/user-manual/en/rest.md
+++ b/docs/user-manual/en/rest.md
@@ -1,7 +1,7 @@
 # REST Interface
 
-The Apache ActiveMQ REST interface allows you to leverage the reliability and
-scalability features of Apache ActiveMQ over a simple REST/HTTP interface.
+The Apache ActiveMQ Artemis REST interface allows you to leverage the reliability and
+scalability features of Apache ActiveMQ Artemis over a simple REST/HTTP interface.
 Messages are produced and consumed by sending and receiving simple HTTP
 messages that contain the content you want to push around. For instance,
 here's a simple example of posting an order to an order processing queue
@@ -18,47 +18,47 @@ express as an HTTP message:
     </order>
 
 As you can see, we're just posting some arbitrary XML document to a URL.
-When the XML is received on the server is it processed within Apache ActiveMQ
-as a JMS message and distributed through core Apache ActiveMQ. Simple and easy.
+When the XML is received on the server is it processed within Apache ActiveMQ Artemis
+as a JMS message and distributed through core Apache ActiveMQ Artemis. Simple and easy.
 Consuming messages from a queue or topic looks very similar. We'll
 discuss the entire interface in detail later in this docbook.
 
 ## Goals of REST Interface
 
-Why would you want to use Apache ActiveMQ's REST interface? What are the goals
+Why would you want to use Apache ActiveMQ Artemis's REST interface? What are the goals
 of the REST interface?
 
 -   Easily usable by machine-based (code) clients.
 
--   Zero client footprint. We want Apache ActiveMQ to be usable by any
+-   Zero client footprint. We want Apache ActiveMQ Artemis to be usable by any
     client/programming language that has an adequate HTTP client
     library. You shouldn't have to download, install, and configure a
-    special library to interact with Apache ActiveMQ.
+    special library to interact with Apache ActiveMQ Artemis.
 
 -   Lightweight interoperability. The HTTP protocol is strong enough to
     be our message exchange protocol. Since interactions are RESTful the
     HTTP uniform interface provides all the interoperability you need to
     communicate between different languages, platforms, and even
     messaging implementations that choose to implement the same RESTful
-    interface as Apache ActiveMQ (i.e. the [REST-\*](http://rest-star.org)
+    interface as Apache ActiveMQ Artemis (i.e. the [REST-\*](http://rest-star.org)
     effort.)
 
 -   No envelope (e.g. SOAP) or feed (e.g. Atom) format requirements. You
     shouldn't have to learn, use, or parse a specific XML document
-    format in order to send and receive messages through Apache ActiveMQ's REST
+    format in order to send and receive messages through Apache ActiveMQ Artemis's REST
     interface.
 
 -   Leverage the reliability, scalability, and clustering features of
-    Apache ActiveMQ on the back end without sacrificing the simplicity of a
+    Apache ActiveMQ Artemis on the back end without sacrificing the simplicity of a
     REST interface.
 
 ## Installation and Configuration
 
-Apache ActiveMQ's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ REST interface is a little bit different depending whether Apache ActiveMQ is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ REST WAR to startup and manage the Apache ActiveMQ server (e.g. you're deploying within something like Apache Tomcat).
+Apache ActiveMQ Artemis's REST interface is installed as a Web archive (WAR). It depends on the [RESTEasy](http://jboss.org/resteasy) project and can currently only run within a servlet container. Installing the Apache ActiveMQ Artemis REST interface is a little bit different depending whether Apache ActiveMQ Artemis is already installed and configured for your environment (e.g. you're deploying within Wildfly) or you want the ActiveMQ REST WAR to startup and manage the Apache ActiveMQ Artemis server (e.g. you're deploying within something like Apache Tomcat).
 
 ### Installing Within Pre-configured Environment
 
-This section should be used when you want to use the Apache ActiveMQ REST interface in an environment that already has Apache ActiveMQ installed and running, e.g. the Wildfly application server. You must create a Web archive (.WAR) file with the following web.xml settings:
+This section should be used when you want to use the Apache ActiveMQ Artemis REST interface in an environment that already has Apache ActiveMQ Artemis installed and running, e.g. the Wildfly application server. You must create a Web archive (.WAR) file with the following web.xml settings:
 
     <web-app>
        <listener>
@@ -86,7 +86,7 @@ This section should be used when you want to use the Apache ActiveMQ REST interf
        </filter-mapping>
     </web-app>
 
-Within your WEB-INF/lib directory you must have the Apache activemq-rest.jar file. If RESTEasy is not installed within your environment, you must add the RESTEasy jar files within the lib directory as well. Here's a sample Maven pom.xml that can build a WAR with the Apache ActiveMQ REST library.
+Within your WEB-INF/lib directory you must have the Apache ActiveMQ Artemis-rest.jar file. If RESTEasy is not installed within your environment, you must add the RESTEasy jar files within the lib directory as well. Here's a sample Maven pom.xml that can build a WAR with the Apache ActiveMQ Artemis REST library.
 
     <project xmlns="http://maven.apache.org/POM/4.0.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -128,7 +128,7 @@ It is worth noting that when deploying a WAR in a Java EE application server lik
 
 ### Bootstrapping ActiveMQ Along with REST
 
-You can bootstrap Apache ActiveMQ within your WAR as well. To do this, you must have the Apache ActiveMQ core and JMS jars along with Netty, RESTEasy, and the Apache ActiveMQ REST jar within your WEB-INF/lib. You must also have an Apache ActiveMQ-configuration.xml config file within WEB-INF/classes. The examples that come with the Apache ActiveMQ REST distribution show how to do this. You must also add an additional listener to your web.xml file. Here's an example:
+You can bootstrap Apache ActiveMQ Artemis within your WAR as well. To do this, you must have the Apache ActiveMQ Artemis core and JMS jars along with Netty, RESTEasy, and the Apache ActiveMQ Artemis REST jar within your WEB-INF/lib. You must also have an Apache ActiveMQ Artemis-configuration.xml config file within WEB-INF/classes. The examples that come with the Apache ActiveMQ Artemis REST distribution show how to do this. You must also add an additional listener to your web.xml file. Here's an example:
 
     <web-app>
        <listener>
@@ -162,7 +162,7 @@ You can bootstrap Apache ActiveMQ within your WAR as well. To do this, you must
        </filter-mapping>
     </web-app>
 
-Here's a Maven pom.xml file for creating a WAR for this environment. Make sure your Apache ActiveMQ configuration file(s) are within the src/main/resources directory so that they are stuffed within the WAR's WEB-INF/classes directory!
+Here's a Maven pom.xml file for creating a WAR for this environment. Make sure your Apache ActiveMQ Artemis configuration file(s) are within the src/main/resources directory so that they are stuffed within the WAR's WEB-INF/classes directory!
 
     <project xmlns="http://maven.apache.org/POM/4.0.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -197,7 +197,7 @@ The project structure should look this like:
 
 ### REST Configuration
 
-The Apache ActiveMQ REST implementation does have some configuration options.
+The Apache ActiveMQ Artemis REST implementation does have some configuration options.
 These are configured via XML configuration file that must be in your
 WEB-INF/classes directory. You must set the web.xml context-param
 `rest.messaging.config.file` to specify the name of the configuration
@@ -220,12 +220,12 @@ values for each.
 
 Let's give an explanation of each config option.
 
--   `server-in-vm-id`. The Apache ActiveMQ REST impl uses the IN-VM transport
-    to communicate with Apache ActiveMQ. It uses the default server id, which
+-   `server-in-vm-id`. The Apache ActiveMQ Artemis REST impl uses the IN-VM transport
+    to communicate with Apache ActiveMQ Artemis. It uses the default server id, which
     is "0".
 
 -   `use-link-headers`. By default, all links (URLs) are published using
-    custom headers. You can instead have the Apache ActiveMQ REST
+    custom headers. You can instead have the Apache ActiveMQ Artemis REST
     implementation publish links using the [Link Header
     specification](http://tools.ietf.org/html/draft-nottingham-http-link-header-10)
     instead if you desire.
@@ -244,7 +244,7 @@ Let's give an explanation of each config option.
     system path. This is a directory where push registrations for queues
     are stored. See [Pushing Messages](#message-push).
 
--   `producer-session-pool-size`. The REST implementation pools Apache ActiveMQ
+-   `producer-session-pool-size`. The REST implementation pools Apache ActiveMQ Artemis
     sessions for sending messages. This is the size of the pool. That
     number of sessions will be created at startup time.
 
@@ -260,12 +260,12 @@ Let's give an explanation of each config option.
     consumers/subscriptions that remain idle for that amount of time.
 
 -   `consumer-window-size`. For consumers, this config option is the
-    same as the Apache ActiveMQ one of the same name. It will be used by
-    sessions created by the Apache ActiveMQ REST implementation.
+    same as the Apache ActiveMQ Artemis one of the same name. It will be used by
+    sessions created by the Apache ActiveMQ Artemis REST implementation.
 
-## Apache ActiveMQ REST Interface Basics
+## Apache ActiveMQ Artemis REST Interface Basics
 
-The Apache ActiveMQ REST interface publishes a variety of REST resources to
+The Apache ActiveMQ Artemis REST interface publishes a variety of REST resources to
 perform various tasks on a queue or topic. Only the top-level queue and
 topic URI schemes are published to the outside world. You must discover
 all over resources to interact with by looking for and traversing links.
@@ -280,7 +280,7 @@ following relative URI pattern:
     /queues/{name}
     /topics/{name}
 
-The base of the URI is the base URL of the WAR you deployed the Apache ActiveMQ
+The base of the URI is the base URL of the WAR you deployed the Apache ActiveMQ Artemis
 REST server within as defined in the [Installation and
 Configuration](#install) section of this document. Replace the `{name}`
 string within the above URI pattern with the name of the queue or topic
@@ -288,7 +288,7 @@ you are interested in interacting with. For example if you have
 configured a JMS topic named "foo" within your `activemq-jms.xml` file,
 the URI name should be "jms.topic.foo". If you have configured a JMS
 queue name "bar" within your `activemq-jms.xml` file, the URI name
-should be "jms.queue.bar". Internally, Apache ActiveMQ prepends the "jms.topic"
+should be "jms.queue.bar". Internally, Apache ActiveMQ Artemis prepends the "jms.topic"
 or "jms.queue" strings to the name of the deployed destination. Next,
 perform your HEAD or GET request on this URI. Here's what a
 request/response would look like.
@@ -317,7 +317,7 @@ on the scheme of the URLs returned within these headers as they are an
 implementation detail. Treat them as opaque and query for them each and
 every time you initially interact (at boot time) with the server. If you
 treat all URLs as opaque then you will be isolated from implementation
-changes as the Apache ActiveMQ REST interface evolves over time.
+changes as the Apache ActiveMQ Artemis REST interface evolves over time.
 
 ### Queue Resource Response Headers
 
@@ -336,7 +336,7 @@ with a Queue resource.
     [Consuming Messages via Pull](#message-pull).
 
 -   `msg-push-consumers`. This is a URL for registering other URLs you
-    want the Apache ActiveMQ REST server to push messages to. The semantics of
+    want the Apache ActiveMQ Artemis REST server to push messages to. The semantics of
     this link are described in [Pushing Messages](#message-push).
 
 ### Topic Resource Response Headers
@@ -356,19 +356,19 @@ with a Topic resource.
     described in [Consuming Messages via Pull](#message-pull).
 
 -   `msg-push-subscriptions`. This is a URL for registering other URLs
-    you want the Apache ActiveMQ REST server to push messages to. The semantics
+    you want the Apache ActiveMQ Artemis REST server to push messages to. The semantics
     of this link are described in [Pushing Messages](#message-push).
 
 ## Posting Messages
 
 This chapter discusses the protocol for posting messages to a queue or a
-topic. In [Apache ActiveMQ REST Interface Basics](#basics), you saw that a
+topic. In [Apache ActiveMQ Artemis REST Interface Basics](#basics), you saw that a
 queue or topic resource publishes variable custom headers that are links
 to other RESTful resources. The `msg-create` header is a URL you can
 post a message to. Messages are published to a queue or topic by sending
 a simple HTTP message to the URL published by the `msg-create` header.
 The HTTP message contains whatever content you want to publish to the
-Apache ActiveMQ destination. Here's an example scenario:
+Apache ActiveMQ Artemis destination. Here's an example scenario:
 
 > **Note**
 >
@@ -450,10 +450,10 @@ Sometimes you might have network problems when posting new messages to a
 queue or topic. You may do a POST and never receive a response.
 Unfortunately, you don't know whether or not the server received the
 message and so a re-post of the message might cause duplicates to be
-posted to the queue or topic. By default, the Apache ActiveMQ REST interface is
+posted to the queue or topic. By default, the Apache ActiveMQ Artemis REST interface is
 configured to accept and post duplicate messages. You can change this by
 turning on duplicate message detection by setting the `dups-ok` config
-option to `false` as described in [Apache ActiveMQ REST Interface
+option to `false` as described in [Apache ActiveMQ Artemis REST Interface
 Basics](#basics). When you do this, the initial POST to the `msg-create`
 URL will redirect you, using the standard HTTP 307 redirection mechanism
 to a unique URL to POST to. All other interactions remain the same as
@@ -531,17 +531,17 @@ discussed earlier. Here's an example:
     in the `msg-create-next` header.
 
 How can this work? As you can see, with each successful response, the
-Apache ActiveMQ REST server returns a uniquely generated URL within the
+Apache ActiveMQ Artemis REST server returns a uniquely generated URL within the
 msg-create-next header. This URL is dedicated to the next new message
 you want to post. Behind the scenes, the code extracts an identify from
-the URL and uses Apache ActiveMQ's duplicate detection mechanism by setting the
+the URL and uses Apache ActiveMQ Artemis's duplicate detection mechanism by setting the
 `DUPLICATE_DETECTION_ID` property of the JMS message that is actually
 posted to the system.
 
 If you happen to use the same ID more than once you'll see a message
 like this on the server:
 
-    WARN  [org.apache.activemq.core.server] (Thread-3 (Apache ActiveMQ-remoting-threads-ActiveMQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) AMQ112098: Duplicate message detected - message will not be routed. Message information:
+    WARN  [org.apache.activemq.artemis.core.server] (Thread-3 (Apache ActiveMQ Artemis-remoting-threads-ActiveMQServerImpl::serverUUID=8d6be6f8-5e8b-11e2-80db-51bbde66f473-26319292-267207)) AMQ112098: Duplicate message detected - message will not be routed. Message information:
     ServerMessage[messageID=20,priority=4, bodySize=1500,expiration=0, durable=true, address=jms.queue.bar,properties=TypedProperties[{http_content$type=application/x-www-form-urlencoded, http_content$length=3, postedAsHttpMessage=true, _AMQ_DUPL_ID=42}]]@12835058
 
 An alternative to this approach is to use the `msg-create-with-id`
@@ -568,7 +568,7 @@ repost the message. It also only has to come up with a unique
 ### Persistent Messages
 
 By default, posted messages are not durable and will not be persisted in
-Apache ActiveMQ's journal. You can create durable messages by modifying the
+Apache ActiveMQ Artemis's journal. You can create durable messages by modifying the
 default configuration as expressed in Chapter 2 so that all messages are
 persisted when sent. Alternatively, you can set a URL query parameter
 called `durable` to true when you post your messages to the URLs
@@ -615,14 +615,14 @@ almost identically for queues and topics with some minor, but important
 caveats. To start consuming you must create a consumer resource on the
 server that is dedicated to your client. Now, this pretty much breaks
 the stateless principle of REST, but after much prototyping, this is the
-best way to work most effectively with Apache ActiveMQ through a REST
+best way to work most effectively with Apache ActiveMQ Artemis through a REST
 interface.
 
 You create consumer resources by doing a simple POST to the URL
 published by the `msg-pull-consumers` response header if you are
 interacting with a queue, the `msg-pull-subscribers` response header if
 you're interacting with a topic. These headers are provided by the main
-queue or topic resource discussed in [Apache ActiveMQ REST Interface
+queue or topic resource discussed in [Apache ActiveMQ Artemis REST Interface
 Basics](#basics). Doing an empty POST to one of these URLs will create a
 consumer resource that follows an auto-acknowledge protocol and, if you
 are interacting with a topic, creates a temporarily subscription to the
@@ -642,7 +642,7 @@ parameters (`application/x-www-form-urlencoded`) described below.
     provide this parameter, the name will be automatically generated by
     the server. Only usable on topics.
 
--   `selector`. This is an optional JMS selector string. The Apache ActiveMQ
+-   `selector`. This is an optional JMS selector string. The Apache ActiveMQ Artemis
     REST interface adds HTTP headers to the JMS message for REST
     produced messages. HTTP headers are prefixed with "http\_" and every
     '-' character is converted to a '\$'.
@@ -810,7 +810,7 @@ resource.
     retry a post. Also notice, that another new msg-consume-next URL is
     present. Although it probably is the same URL you used last post,
     get in the habit of using URLs returned in response headers as
-    future versions of Apache ActiveMQ REST might be redirecting you or adding
+    future versions of Apache ActiveMQ Artemis REST might be redirecting you or adding
     additional data to the URL after timeouts like this.
 
 3.  POST to the URL within the last `msg-consume-next` to get the next
@@ -1063,7 +1063,7 @@ request on the consumer resource.
 Unless your queue or topic has a high rate of message flowing though it,
 if you use the pull protocol, you're going to be receiving a lot of 503
 responses as you continuously pull the server for new messages. To
-alleviate this problem, the Apache ActiveMQ REST interface provides the
+alleviate this problem, the Apache ActiveMQ Artemis REST interface provides the
 `Accept-Wait` header. This is a generic HTTP request header that is a
 hint to the server for how long the client is willing to wait for a
 response from the server. The value of this header is the time in
@@ -1098,9 +1098,9 @@ server-side consumer resource (and underlying JMS session).
 
 ## Pushing Messages
 
-You can configure the Apache ActiveMQ REST server to push messages to a
+You can configure the Apache ActiveMQ Artemis REST server to push messages to a
 registered URL either remotely through the REST interface, or by
-creating a pre-configured XML file for the Apache ActiveMQ REST server to load
+creating a pre-configured XML file for the Apache ActiveMQ Artemis REST server to load
 at boot time.
 
 ### The Queue Push Subscription XML
@@ -1145,7 +1145,7 @@ performing a retry.
 The `disableOnFailure` element, if set to true, will disable the
 registration if all retries have failed. It will not disable the
 connection on non-connection-failure issues (like a bad request for
-instance). In these cases, the dead letter queue logic of Apache ActiveMQ will
+instance). In these cases, the dead letter queue logic of Apache ActiveMQ Artemis will
 take over.
 
 The `link` element specifies the basis of the interaction. The `href`
@@ -1158,10 +1158,10 @@ important and the value of it triggers different behavior. Here's the
 values a rel attribute can have:
 
 -   `destination`. The href URL is assumed to be a queue or topic
-    resource of another Apache ActiveMQ REST server. The push registration will
+    resource of another Apache ActiveMQ Artemis REST server. The push registration will
     initially do a HEAD request to this URL to obtain a
     msg-create-with-id header. It will use this header to push new
-    messages to the Apache ActiveMQ REST endpoint reliably. Here's an example:
+    messages to the Apache ActiveMQ Artemis REST endpoint reliably. Here's an example:
 
         <push-registration>
            <link rel="destination" href="http://somewhere.com/queues/jms.queue.foo"/>
@@ -1368,19 +1368,19 @@ Here's what creating a topic would look like:
     HTTP/1.1 201 Created
     Location: http://example.com/topics/jms.topic.testTopic
 
-## Securing the Apache ActiveMQ REST Interface
+## Securing the Apache ActiveMQ Artemis REST Interface
 
 ### Within Wildfly Application server
 
-Securing the Apache ActiveMQ REST interface is very simple with the Wildfly
+Securing the Apache ActiveMQ Artemis REST interface is very simple with the Wildfly
 Application Server. You turn on authentication for all URLs within your
-WAR's web.xml, and let the user Principal to propagate to Apache ActiveMQ. This
-only works if you are using the JAASSecurityManager with Apache ActiveMQ. See
-the Apache ActiveMQ documentation for more details.
+WAR's web.xml, and let the user Principal to propagate to Apache ActiveMQ Artemis. This
+only works if you are using the JAASSecurityManager with Apache ActiveMQ Artemis. See
+the Apache ActiveMQ Artemis documentation for more details.
 
 ### Security in other environments
 
-To secure the Apache ActiveMQ REST interface in other environments you must
+To secure the Apache ActiveMQ Artemis REST interface in other environments you must
 role your own security by specifying security constraints with your
 web.xml for every path of every queue and topic you have deployed. Here
 is a list of URI patterns:
@@ -1399,7 +1399,7 @@ Post | Description
 
 ## Mixing JMS and REST
 
-The Apache ActiveMQ REST interface supports mixing JMS and REST producers and
+The Apache ActiveMQ Artemis REST interface supports mixing JMS and REST producers and
 consumers. You can send an ObjectMessage through a JMS Producer, and
 have a REST client consume it. You can have a REST client POST a message
 to a topic and have a JMS Consumer receive it. Some simple
@@ -1408,10 +1408,10 @@ installed.
 
 ### JMS Producers - REST Consumers
 
-If you have a JMS producer, the Apache ActiveMQ REST interface only supports
+If you have a JMS producer, the Apache ActiveMQ Artemis REST interface only supports
 ObjectMessage type. If the JMS producer is aware that there may be REST
 consumers, it should set a JMS property to specify what Content-Type the
-Java object should be translated into by REST clients. The Apache ActiveMQ REST
+Java object should be translated into by REST clients. The Apache ActiveMQ Artemis REST
 server will use RESTEasy content handlers (MessageBodyReader/Writers) to
 transform the Java object to the type desired. Here's an example of a
 JMS producer setting the content type of the message.
@@ -1429,7 +1429,7 @@ push registration should be set to the desired type.
 ### REST Producers - JMS Consumers
 
 If you have a REST client producing messages and a JMS consumer,
-Apache ActiveMQ REST has a simple helper class for you to transform the HTTP
+Apache ActiveMQ Artemis REST has a simple helper class for you to transform the HTTP
 body to a Java object. Here's some example code:
 
 ```java

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 8141d15..4fffa5d 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -1,6 +1,6 @@
 # Security
 
-This chapter describes how security works with Apache ActiveMQ and how you can
+This chapter describes how security works with Apache ActiveMQ Artemis and how you can
 configure it. To disable security completely simply set the
 `security-enabled` property to false in the `activemq-configuration.xml`
 file.
@@ -12,15 +12,15 @@ is `10000` ms.
 
 ## Role based security for addresses
 
-Apache ActiveMQ contains a flexible role-based security model for applying
+Apache ActiveMQ Artemis contains a flexible role-based security model for applying
 security to queues, based on their addresses.
 
-As explained in [Using Core](using-core.md), Apache ActiveMQ core consists mainly of sets of queues bound
+As explained in [Using Core](using-core.md), Apache ActiveMQ Artemis core consists mainly of sets of queues bound
 to addresses. A message is sent to an address and the server looks up
 the set of queues that are bound to that address, the server then routes
 the message to those set of queues.
 
-Apache ActiveMQ allows sets of permissions to be defined against the queues
+Apache ActiveMQ Artemis allows sets of permissions to be defined against the queues
 based on their address. An exact match on the address can be used or a
 wildcard match can be used using the wildcard characters '`#`' and
 '`*`'.
@@ -83,7 +83,7 @@ these addresses or consume messages from queues bound to an address that
 starts with the string "globalqueues.europe."
 
 The mapping between a user and what roles they have is handled by the
-security manager. Apache ActiveMQ ships with a user manager that reads user
+security manager. Apache ActiveMQ Artemis ships with a user manager that reads user
 credentials from a file on disk, and can also plug into JAAS or JBoss
 Application Server security.
 
@@ -124,14 +124,14 @@ in sub-groups of addresses.
 
 When messaging clients are connected to servers, or servers are
 connected to other servers (e.g. via bridges) over an untrusted network
-then Apache ActiveMQ allows that traffic to be encrypted using the Secure
+then Apache ActiveMQ Artemis allows that traffic to be encrypted using the Secure
 Sockets Layer (SSL) transport.
 
 For more information on configuring the SSL transport, please see [Configuring the Transport](configuring-transports.md).
 
 ## Basic user credentials
 
-Apache ActiveMQ ships with a security manager implementation that reads user
+Apache ActiveMQ Artemis ships with a security manager implementation that reads user
 credentials, i.e. user names, passwords and role information from properties
 files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager.
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/send-guarantees.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/send-guarantees.md b/docs/user-manual/en/send-guarantees.md
index a441337..d65bf67 100644
--- a/docs/user-manual/en/send-guarantees.md
+++ b/docs/user-manual/en/send-guarantees.md
@@ -2,7 +2,7 @@
 
 ## Guarantees of Transaction Completion
 
-When committing or rolling back a transaction with Apache ActiveMQ, the request
+When committing or rolling back a transaction with Apache ActiveMQ Artemis, the request
 to commit or rollback is sent to the server, and the call will block on
 the client side until a response has been received from the server that
 the commit or rollback was executed.
@@ -27,7 +27,7 @@ This parameter is set in `activemq-configuration.xml`
 ## Guarantees of Non Transactional Message Sends
 
 If you are sending messages to a server using a non transacted session,
-Apache ActiveMQ can be configured to block the call to send until the message
+Apache ActiveMQ Artemis can be configured to block the call to send until the message
 has definitely reached the server, and a response has been sent back to
 the client. This can be configured individually for durable and
 non-durable messages, and is determined by the following two parameters:
@@ -49,7 +49,7 @@ network round trip time (RTT) of your network, rather than the bandwidth
 of your network. For better performance we recommend either batching
 many messages sends together in a transaction since with a transactional
 session, only the commit / rollback blocks not every send, or, using
-Apache ActiveMQ's advanced *asynchronous send acknowledgements feature*
+Apache ActiveMQ Artemis's advanced *asynchronous send acknowledgements feature*
 described in Asynchronous Send Acknowledgements.
 
 If you are using JMS and JNDI then using the elements
@@ -73,7 +73,7 @@ The default value for this parameter is `true`.
 ## Guarantees of Non Transactional Acknowledgements
 
 If you are acknowledging the delivery of a message at the client side
-using a non transacted session, Apache ActiveMQ can be configured to block the
+using a non transacted session, Apache ActiveMQ Artemis can be configured to block the
 call to acknowledge until the acknowledge has definitely reached the
 server, and a response has been sent back to the client. This is
 configured with the parameter `BlockOnAcknowledge`. If this is set to
@@ -87,7 +87,7 @@ implement a strict *at most once* delivery policy. The default value is
 
 If you are using a non transacted session but want a guarantee that
 every message sent to the server has reached it, then, as discussed in
-Guarantees of Non Transactional Message Sends, you can configure Apache ActiveMQ to block the call to send until the server
+Guarantees of Non Transactional Message Sends, you can configure Apache ActiveMQ Artemis to block the call to send until the server
 has received the message, persisted it and sent back a response. This
 works well but has a severe performance penalty - each call to send
 needs to block for at least the time of a network round trip (RTT) - the
@@ -108,8 +108,8 @@ messages are sent without blocking! These figures aren't an exact
 science but you can clearly see that being limited by network RTT can
 have serious effect on performance.
 
-To remedy this, Apache ActiveMQ provides an advanced new feature called
-*asynchronous send acknowledgements*. With this feature, Apache ActiveMQ can be
+To remedy this, Apache ActiveMQ Artemis provides an advanced new feature called
+*asynchronous send acknowledgements*. With this feature, Apache ActiveMQ Artemis can be
 configured to send messages without blocking in one direction and
 asynchronously getting acknowledgement from the server that the messages
 were received in a separate stream. By de-coupling the send from the
@@ -132,7 +132,7 @@ a handler instance on your `ClientSession`.
 Then, you just send messages as normal using your `ClientSession`, and
 as messages reach the server, the server will send back an
 acknowledgement of the send asynchronously, and some time later you are
-informed at the client side by Apache ActiveMQ calling your handler's
+informed at the client side by Apache ActiveMQ Artemis calling your handler's
 `sendAcknowledged(ClientMessage message)` method, passing in a reference
 to the message that was sent.
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/slow-consumers.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/slow-consumers.md b/docs/user-manual/en/slow-consumers.md
index 071c9ae..b53bac5 100644
--- a/docs/user-manual/en/slow-consumers.md
+++ b/docs/user-manual/en/slow-consumers.md
@@ -1,6 +1,6 @@
 #Detecting Slow Consumers
 
-In this section we will discuss how Apache ActiveMQ can be configured to deal
+In this section we will discuss how Apache ActiveMQ Artemis can be configured to deal
 with slow consumers. A slow consumer with a server-side queue (e.g. JMS
 topic subscriber) can pose a significant problem for broker performance.
 If messages build up in the consumer's server-side queue then memory

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/spring-integration.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/spring-integration.md b/docs/user-manual/en/spring-integration.md
index 1cdb454..21d112e 100644
--- a/docs/user-manual/en/spring-integration.md
+++ b/docs/user-manual/en/spring-integration.md
@@ -1,11 +1,11 @@
 # Spring Integration
 
-Apache ActiveMQ provides a simple bootstrap class,
+Apache ActiveMQ Artemis provides a simple bootstrap class,
 `org.apache.activemq.integration.spring.SpringJmsBootstrap`, for
-integration with Spring. To use it, you configure Apache ActiveMQ as you always
+integration with Spring. To use it, you configure Apache ActiveMQ Artemis as you always
 would, through its various configuration files like
 `activemq-configuration.xml`, `activemq-jms.xml`, and
-`activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ server
+`activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ Artemis server
 and adds any factories or destinations configured within
 `activemq-jms.xml` directly into the namespace of the Spring context.
 Let's take this `activemq-jms.xml` file for instance:

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/thread-pooling.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md
index fc547ef..59500e7 100644
--- a/docs/user-manual/en/thread-pooling.md
+++ b/docs/user-manual/en/thread-pooling.md
@@ -1,6 +1,6 @@
 # Thread management
 
-This chapter describes how Apache ActiveMQ uses and pools threads and how you
+This chapter describes how Apache ActiveMQ Artemis uses and pools threads and how you
 can manage them.
 
 First we'll discuss how threads are managed and used on the server side,
@@ -8,12 +8,12 @@ then we'll look at the client side.
 
 ## Server-Side Thread Management
 
-Each Apache ActiveMQ Server maintains a single thread pool for general use, and
+Each Apache ActiveMQ Artemis Server maintains a single thread pool for general use, and
 a scheduled thread pool for scheduled use. A Java scheduled thread pool
 cannot be configured to use a standard thread pool, otherwise we could
 use a single thread pool for both scheduled and non scheduled activity.
 
-A separate thread pool is also used to service connections. Apache ActiveMQ can
+A separate thread pool is also used to service connections. Apache ActiveMQ Artemis can
 use "old" (blocking) IO or "new" (non-blocking) IO also called NIO. Both
 of these options use a separate thread pool, but each of them behaves
 uniquely.
@@ -33,7 +33,7 @@ However, even an unbounded thread pool can run into trouble if it
 becomes too large. If you require the server to handle many concurrent
 connections you should use NIO, not old IO.
 
-When using new IO (NIO), Apache ActiveMQ will, by default, cap its thread pool
+When using new IO (NIO), Apache ActiveMQ Artemis will, by default, cap its thread pool
 at three times the number of cores (or hyper-threads) as reported by `
             Runtime.getRuntime().availableProcessors()` for processing
 incoming packets. To override this value, you can set the number of
@@ -96,7 +96,7 @@ For more information on configuring the reaper, please see [message expiry](mess
 
 Asynchronous IO has a thread pool for receiving and dispatching events
 out of the native layer. You will find it on a thread dump with the
-prefix ActiveMQ-AIO-poller-pool. Apache ActiveMQ uses one thread per opened
+prefix ActiveMQ-AIO-poller-pool. Apache ActiveMQ Artemis uses one thread per opened
 file on the journal (there is usually one).
 
 There is also a single thread used to invoke writes on libaio. We do
@@ -106,14 +106,14 @@ ActiveMQ-AIO-writer-pool.
 
 ## Client-Side Thread Management
 
-On the client side, Apache ActiveMQ maintains a single static scheduled thread
+On the client side, Apache ActiveMQ Artemis maintains a single static scheduled thread
 pool and a single static general thread pool for use by all clients
 using the same classloader in that JVM instance.
 
 The static scheduled thread pool has a maximum size of `5` threads, and
 the general purpose thread pool has an unbounded maximum size.
 
-If required Apache ActiveMQ can also be configured so that each
+If required Apache ActiveMQ Artemis can also be configured so that each
 `ClientSessionFactory` instance does not use these static pools but
 instead maintains its own scheduled and general purpose pool. Any
 sessions created from that `ClientSessionFactory` will use those pools
@@ -149,7 +149,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
 
     java.naming.provider.url=tcp://localhost:61616
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/tools.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/tools.md b/docs/user-manual/en/tools.md
index 1df2324..63a56ac 100644
--- a/docs/user-manual/en/tools.md
+++ b/docs/user-manual/en/tools.md
@@ -1,6 +1,6 @@
 # Tools
 
-Apache ActiveMQ ships with several helpful command line tools. All tools are
+Apache ActiveMQ Artemis ships with several helpful command line tools. All tools are
 available from the activemq-tools-\<version\>-jar-with-dependencies.jar.
 As the name suggests, this Java archive contains ActiveMQ along with all
 of its dependencies. This is done to simplify the execution of the tools
@@ -55,7 +55,7 @@ java -jar activemq-tools-<version>-jar-with-dependencies.jar export /home/user/a
 
 -   **`import`**. Used for importing data from an XML document generated
     by the `export` tool. The `import` tool reads the XML document and
-    connects to an Apache ActiveMQ server via Netty to import all the data. It
+    connects to an Apache ActiveMQ Artemis server via Netty to import all the data. It
     takes 5 parameters:
 
     -   `input-file` - the path to the XML file generated by the

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/transaction-config.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/transaction-config.md b/docs/user-manual/en/transaction-config.md
index cbe6d80..5a98d75 100644
--- a/docs/user-manual/en/transaction-config.md
+++ b/docs/user-manual/en/transaction-config.md
@@ -1,13 +1,13 @@
 # Resource Manager Configuration
 
-Apache ActiveMQ has its own Resource Manager for handling the lifespan of JTA
+Apache ActiveMQ Artemis has its own Resource Manager for handling the lifespan of JTA
 transactions. When a transaction is started the resource manager is
 notified and keeps a record of the transaction and its current state. It
 is possible in some cases for a transaction to be started but then
 forgotten about. Maybe the client died and never came back. If this
 happens then the transaction will just sit there indefinitely.
 
-To cope with this Apache ActiveMQ can, if configured, scan for old transactions
+To cope with this Apache ActiveMQ Artemis can, if configured, scan for old transactions
 and rollback any it finds. The default for this is 3000000 milliseconds
 (5 minutes), i.e. any transactions older than 5 minutes are removed.
 This timeout can be changed by editing the `transaction-timeout`
@@ -15,7 +15,7 @@ property in `activemq-configuration.xml` (value must be in
 milliseconds). The property `transaction-timeout-scan-period` configures
 how often, in milliseconds, to scan for old transactions.
 
-Please note that Apache ActiveMQ will not unilaterally rollback any XA
+Please note that Apache ActiveMQ Artemis will not unilaterally rollback any XA
 transactions in a prepared state - this must be heuristically rolled
 back via the management API if you are sure they will never be resolved
 by the transaction manager.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/undelivered-messages.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/undelivered-messages.md b/docs/user-manual/en/undelivered-messages.md
index 30e32cb..7241031 100644
--- a/docs/user-manual/en/undelivered-messages.md
+++ b/docs/user-manual/en/undelivered-messages.md
@@ -46,7 +46,7 @@ Delayed redelivery is defined in the address-setting configuration:
 
     </address-setting>
 
-If a `redelivery-delay` is specified, Apache ActiveMQ will wait this delay
+If a `redelivery-delay` is specified, Apache ActiveMQ Artemis will wait this delay
 before redelivering the messages.
 
 By default, there is no redelivery delay (`redelivery-delay`is set to
@@ -92,7 +92,7 @@ to a dead letter address.
 Any such messages can then be diverted to queue(s) where they can later
 be perused by the system administrator for action to be taken.
 
-Apache ActiveMQ's addresses can be assigned a dead letter address. Once the
+Apache ActiveMQ Artemis's addresses can be assigned a dead letter address. Once the
 messages have been unsuccessfully delivered for a given number of
 attempts, they are removed from their queue and sent to the relevant
 dead letter address. These *dead letter* messages can later be consumed
@@ -144,7 +144,7 @@ that shows how dead letter is configured and used with JMS.
 
 ## Delivery Count Persistence
 
-In normal use, Apache ActiveMQ does not update delivery count *persistently*
+In normal use, Apache ActiveMQ Artemis does not update delivery count *persistently*
 until a message is rolled back (i.e. the delivery count is not updated
 *before* the message is delivered to the consumer). In most messaging
 use cases, the messages are consumed, acknowledged and forgotten as soon
@@ -160,7 +160,7 @@ delivery count. During the recovery phase, the server will not have
 knowledge of that and will deliver the message with `redelivered` set to
 `false` while it should be `true`.
 
-As this behavior breaks strict JMS semantics, Apache ActiveMQ allows to persist
+As this behavior breaks strict JMS semantics, Apache ActiveMQ Artemis allows to persist
 delivery count before message delivery but this feature is disabled by default
 due to performance implications.
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/using-core.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-core.md b/docs/user-manual/en/using-core.md
index d23cbac..255c228 100644
--- a/docs/user-manual/en/using-core.md
+++ b/docs/user-manual/en/using-core.md
@@ -1,6 +1,6 @@
 # Using Core
 
-Apache ActiveMQ core is a completely JMS-agnostic messaging system with its own
+Apache ActiveMQ Artemis core is a completely JMS-agnostic messaging system with its own
 non-JMS API. We call this the *core API*.
 
 If you don't want to use JMS you can use the core API directly. The core
@@ -41,16 +41,16 @@ please consult the Javadoc.
 
 -   Messages can be specified with a priority value between 0 and 9. 0
     represents the lowest priority and 9 represents the highest.
-    Apache ActiveMQ will attempt to deliver higher priority messages before
+    Apache ActiveMQ Artemis will attempt to deliver higher priority messages before
     lower priority ones.
 
--   Messages can be specified with an optional expiry time. Apache ActiveMQ
+-   Messages can be specified with an optional expiry time. Apache ActiveMQ Artemis
     will not deliver messages after its expiry time has been exceeded.
 
 -   Messages also have an optional timestamp which represents the time
     the message was sent.
 
--   Apache ActiveMQ also supports the sending/consuming of very large messages
+-   Apache ActiveMQ Artemis also supports the sending/consuming of very large messages
     much larger than can fit in available RAM at any one time.
 
 ### Address
@@ -132,7 +132,7 @@ ClientSession instances group ClientConsumers and ClientProducers.
 ClientSession instances can be registered with an optional
 `SendAcknowledgementHandler`. This allows your client code to be
 notified asynchronously when sent messages have successfully reached the
-server. This unique Apache ActiveMQ feature, allows you to have full guarantees
+server. This unique Apache ActiveMQ Artemis feature, allows you to have full guarantees
 that sent messages have reached the server without having to block on
 each message sent until a response is received. Blocking on each
 messages sent is costly since it requires a network round trip for each

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/using-jms.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md
index 3212aaa..2ae15d4 100644
--- a/docs/user-manual/en/using-jms.md
+++ b/docs/user-manual/en/using-jms.md
@@ -1,6 +1,6 @@
 # Using JMS
 
-Although Apache ActiveMQ provides a JMS agnostic messaging API, many users will
+Although Apache ActiveMQ Artemis provides a JMS agnostic messaging API, many users will
 be more comfortable using JMS.
 
 JMS is a very popular API standard for messaging, and most messaging
@@ -8,7 +8,7 @@ systems provide a JMS API. If you are completely new to JMS we suggest
 you follow the [Oracle JMS tutorial](http://docs.oracle.com/javaee/7/tutorial/partmessaging.htm) -
 a full JMS tutorial is out of scope for this guide.
 
-Apache ActiveMQ also ships with a wide range of examples, many of which
+Apache ActiveMQ Artemis also ships with a wide range of examples, many of which
 demonstrate JMS API usage. A good place to start would be to play around
 with the simple JMS Queue and Topic example, but we also provide
 examples for many other parts of the JMS API. A full description of the
@@ -16,7 +16,7 @@ examples is available in [Examples](examples.md).
 
 In this section we'll go through the main steps in configuring the
 server for JMS and creating a simple JMS program. We'll also show how to
-configure and use JNDI, and also how to use JMS with Apache ActiveMQ without
+configure and use JNDI, and also how to use JMS with Apache ActiveMQ Artemis without
 using any JNDI.
 
 A simple ordering system
@@ -42,18 +42,18 @@ JNDI Configuration
 The JMS specification establishes the convention that *administered
 objects* (i.e. JMS queue, topic and connection factory instances) are
 made available via the JNDI API. Brokers are free to implement JNDI as
-they see fit assuming the implementation fits the API. Apache ActiveMQ does not
+they see fit assuming the implementation fits the API. Apache ActiveMQ Artemis does not
 have a JNDI server. Rather, it uses a client-side JNDI implementation
 that relies on special properties set in the environment to construct
 the appropriate JMS objects. In other words, no objects are stored in
-JNDI on the Apache ActiveMQ server, instead they are simply instantiated on the
+JNDI on the Apache ActiveMQ Artemis server, instead they are simply instantiated on the
 client based on the provided configuration. Let's look at the different
 kinds of administered objects and how to configure them.
 
 > **Note**
 >
 > The following configuration properties *are strictly required when
-> Apache ActiveMQ is running in stand-alone mode*. When Apache ActiveMQ is integrated
+> Apache ActiveMQ Artemis is running in stand-alone mode*. When Apache ActiveMQ Artemis is integrated
 > to an application server (e.g. Wildfly) the application server itself
 > will almost certainly provide a JNDI client with its own properties.
 
@@ -66,9 +66,9 @@ well as many other configuration parameters.
 
 Here's a simple example of the JNDI context environment for a client
 looking up a connection factory to access an *embedded* instance of
-Apache ActiveMQ:
+Apache ActiveMQ Artemis:
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
     connectionFactory.invmConnectionFactory=vm://0
 
 In this instance we have created a connection factory that is bound to
@@ -81,7 +81,7 @@ have an InVM acceptor with a unique server-ID. A client using JMS and
 JNDI can account for this by specifying a connction factory for each
 server, like so:
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
     connectionFactory.invmConnectionFactory0=vm://0
     connectionFactory.invmConnectionFactory1=vm://1
     connectionFactory.invmConnectionFactory2=vm://2
@@ -101,7 +101,7 @@ most commonly connect across a network a remote broker. Here's a simple
 example of a client configuring a connection factory to connect to a
 remote broker running on myhost:5445:
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
     connectionFactory.ConnectionFactory=tcp://myhost:5445
 
 In the example above the client is using the `tcp` scheme for the
@@ -180,7 +180,7 @@ are supported just like with `udp`.
 The default type for the default connection factory is of type `javax.jms.ConnectionFactory`.
 This can be changed by setting the type like so
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
     java.naming.provider.url=tcp://localhost:5445?type=CF
 
 In this example it is still set to the default, below shows a list of types that can be set.
@@ -203,7 +203,7 @@ connection factories, destinations can be configured using special
 properties in the JNDI context environment. The property *name* should
 follow the pattern: `queue.<jndi-binding>` or `topic.<jndi-binding>`.
 The property *value* should be the name of the queue hosted by the
-Apache ActiveMQ server. For example, if the server had a JMS queue configured
+Apache ActiveMQ Artemis server. For example, if the server had a JMS queue configured
 like so:
 
     <queue name="OrderQueue"/>
@@ -211,7 +211,7 @@ like so:
 And if the client wanted to bind this queue to "queues/OrderQueue" then
 the JNDI properties would be configured like so:
 
-    java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+    java.naming.factory.initial=ActiveMQInitialContextFactory
     java.naming.provider.url=tcp://myhost:5445
     queue.queues/OrderQueue=OrderQueue
 
@@ -296,7 +296,7 @@ Although it is a very common JMS usage pattern to lookup JMS
 instances) from JNDI, in some cases you just think "Why do I need JNDI?
 Why can't I just instantiate these objects directly?"
 
-With Apache ActiveMQ you can do exactly that. Apache ActiveMQ supports the direct
+With Apache ActiveMQ Artemis you can do exactly that. Apache ActiveMQ Artemis supports the direct
 instantiation of JMS Queue, Topic and ConnectionFactory instances, so
 you don't have to use JNDI at all.
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/using-server.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index 8a22f8f..8797259 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -1,12 +1,12 @@
 # Using the Server
 
-This chapter will familiarise you with how to use the Apache ActiveMQ server.
+This chapter will familiarise you with how to use the Apache ActiveMQ Artemis server.
 
 We'll show where it is, how to start and stop it, and we'll describe the
 directory layout and what all the files are and what they do.
 
-For the remainder of this chapter when we talk about the Apache ActiveMQ server
-we mean the Apache ActiveMQ standalone server, in its default configuration
+For the remainder of this chapter when we talk about the Apache ActiveMQ Artemis server
+we mean the Apache ActiveMQ Artemis standalone server, in its default configuration
 with a JMS Service enabled.
 
 This document will refer to the full path of the directory where the ActiveMQ
@@ -47,12 +47,12 @@ to do start running the broker instance is execute:
 Now that the broker is running, you can optionally run some of the included 
 examples to verify the the broker is running properly.
 
-To stop the Apache ActiveMQ instance you will use the same `activemq` script, but with 
+To stop the Apache ActiveMQ Artemis instance you will use the same `activemq` script, but with 
 the `stop argument`.  Example:
 
     /var/lib/mybroker/bin/activemq stop
 
-Please note that Apache ActiveMQ requires a Java 7 or later runtime to run.
+Please note that Apache ActiveMQ Artemis requires a Java 7 or later runtime to run.
 
 By default the `etc/bootstrap.xml` configuration is
 used. The configuration can be changed e.g. by running
@@ -69,7 +69,7 @@ The run scripts set some JVM settings for tuning the garbage collection
 policy and heap size. We recommend using a parallel garbage collection
 algorithm to smooth out latency and minimise large GC pauses.
 
-By default Apache ActiveMQ runs in a maximum of 1GiB of RAM. To increase the
+By default Apache ActiveMQ Artemis runs in a maximum of 1GiB of RAM. To increase the
 memory settings change the `-Xms` and `-Xmx` memory settings as you
 would for any Java program.
 
@@ -103,7 +103,7 @@ JVM will use the environment variable `LD_LIBRARY_PATH`.
 
 ## System properties
 
-Apache ActiveMQ can take a system property on the command line for configuring
+Apache ActiveMQ Artemis can take a system property on the command line for configuring
 logging.
 
 For more information on configuring logging, please see the section on
@@ -155,11 +155,11 @@ The bootstrap file is very simple. Let's take a look at an example:
 
 ## The main configuration file.
 
-The configuration for the Apache ActiveMQ core server is contained in
+The configuration for the Apache ActiveMQ Artemis core server is contained in
 `activemq-configuration.xml`. This is what the FileConfiguration bean
 uses to configure the messaging server.
 
-There are many attributes which you can configure Apache ActiveMQ. In most
+There are many attributes which you can configure Apache ActiveMQ Artemis. In most
 cases the defaults will do fine, in fact every attribute can be
 defaulted which means a file with a single empty `configuration` element
 is a valid configuration file. The different configuration will be

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/vertx-integration.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/vertx-integration.md b/docs/user-manual/en/vertx-integration.md
index 20168a9..9c52a0f 100644
--- a/docs/user-manual/en/vertx-integration.md
+++ b/docs/user-manual/en/vertx-integration.md
@@ -4,14 +4,14 @@
 application platform for the JVM that's designed for modern mobile, web,
 and enterprise applications. Vert.x provides a distributed event bus
 that allows messages to be sent across vert.x instances and clients. You
-can now redirect and persist any vert.x messages to Apache ActiveMQ and route
-those messages to a specified vertx address by configuring Apache ActiveMQ
+can now redirect and persist any vert.x messages to Apache ActiveMQ Artemis and route
+those messages to a specified vertx address by configuring Apache ActiveMQ Artemis
 vertx incoming and outgoing vertx connector services.
 
 ## Configuring a Vertx Incoming Connector Service
 
 Vertx Incoming Connector services receive messages from vertx event bus
-and route them to an Apache ActiveMQ queue. Such a service can be configured as
+and route them to an Apache ActiveMQ Artemis queue. Such a service can be configured as
 follows:
 
     <connector-service name="vertx-incoming-connector">
@@ -25,7 +25,7 @@ follows:
 
 Shown are the required params for the connector service:
 
--   `queue`. The name of the Apache ActiveMQ queue to send message to.
+-   `queue`. The name of the Apache ActiveMQ Artemis queue to send message to.
 
 As well as these required parameters there are the following optional
 parameters
@@ -62,7 +62,7 @@ as follows:
 
 Shown are the required params for the connector service:
 
--   `queue`. The name of the Apache ActiveMQ queue to fetch message from.
+-   `queue`. The name of the Apache ActiveMQ Artemis queue to fetch message from.
 
 As well as these required paramaters there are the following optional
 parameters

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/wildcard-routing.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/wildcard-routing.md b/docs/user-manual/en/wildcard-routing.md
index 202b053..ee37877 100644
--- a/docs/user-manual/en/wildcard-routing.md
+++ b/docs/user-manual/en/wildcard-routing.md
@@ -1,6 +1,6 @@
 # Routing Messages With Wild Cards
 
-Apache ActiveMQ allows the routing of messages via wildcard addresses.
+Apache ActiveMQ Artemis allows the routing of messages via wildcard addresses.
 
 If a queue is created with an address of say `queue.news.#` then it will
 receive any messages sent to addresses that match this, for instance

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/docs/user-manual/en/wildcard-syntax.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/wildcard-syntax.md b/docs/user-manual/en/wildcard-syntax.md
index a94adba..34ed95f 100644
--- a/docs/user-manual/en/wildcard-syntax.md
+++ b/docs/user-manual/en/wildcard-syntax.md
@@ -1,11 +1,11 @@
-# Understanding the Apache ActiveMQ Wildcard Syntax
+# Understanding the Apache ActiveMQ Artemis Wildcard Syntax
 
-Apache ActiveMQ uses a specific syntax for representing wildcards in security
+Apache ActiveMQ Artemis uses a specific syntax for representing wildcards in security
 settings, address settings and when creating consumers.
 
 The syntax is similar to that used by [AMQP](http://www.amqp.org).
 
-An Apache ActiveMQ wildcard expression contains words delimited by the character
+An Apache ActiveMQ Artemis wildcard expression contains words delimited by the character
 '`.`' (full stop).
 
 The special characters '`#`' and '`*`' also have special meaning and can

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/etc/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml
index 776eee4..ae8aa46 100644
--- a/etc/findbugs-exclude.xml
+++ b/etc/findbugs-exclude.xml
@@ -37,19 +37,19 @@ under the License.
   <!-- Ok to return mutable Object -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage" />
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage" />
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage" />
     </Or>
     <Bug pattern="EI_EXPOSE_REP"/>
   </Match>
   <!-- Ok to return mutable Object, here restricted to method getRecordData -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage" />
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage" />
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage" />
-      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationAddTXMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage" />
+      <Class name="org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationPrepareMessage" />
     </Or>
     <Method name="getRecordData" />
     <Bug pattern="EI_EXPOSE_REP"/>
@@ -104,32 +104,32 @@ under the License.
 
   <Match>
     <!-- Code is meant to measure memory usage, so calling Garbage Collection is normal. -->
-    <Class name="org.apache.activemq.utils.MemorySize"/>
+    <Class name="org.apache.activemq.artemis.utils.MemorySize"/>
     <bug pattern="DM_GC"/>
   </Match>
 
   <match>
     <!-- Ignore naming convention violations in generated code -->
-    <class name="org.apache.activemq.core.filter.impl.FilterParser"/>
+    <class name="org.apache.activemq.artemis.core.filter.impl.FilterParser"/>
     <bug pattern="NM_METHOD_NAMING_CONVENTION"/>
   </match>
 
   <Match>
     <!-- field changes are always guarded by PagingStoreImpl.lock.writeLock().lock() -->
-    <Class name="org.apache.activemq.core.paging.impl.PagingStoreImpl"/>
+    <Class name="org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl"/>
     <Field name="numberOfPages" />
     <Bug pattern="VO_VOLATILE_INCREMENT"/>
   </Match>
 
   <Match>
     <!-- File is generated by JavaCC -->
-    <Class name="org.apache.activemq.core.filter.impl.ParseException"/>
+    <Class name="org.apache.activemq.artemis.core.filter.impl.ParseException"/>
     <bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
   </Match>
 
   <Match>
     <!-- Generated by JavaCC: ignore naming convention violation -->
-    <Class name="~org\.activemq\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/>
+    <Class name="~org\.apache\.activemq\.artemis\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/>
     <bug pattern="NM_METHOD_NAMING_CONVENTION,SF_SWITCH_NO_DEFAULT,MS_PKGPROTECT,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,MS_OOI_PKGPROTECT"/>
   </Match>
 
@@ -140,17 +140,17 @@ under the License.
 
   <!-- Ignore checks on return values, example File.delete(), on samples/examples -->
   <Match>
-    <Class name="~org\.activemq\.common\.example.*Example"/>
+    <Class name="~org\.apache\.activemq\.artemis\.common\.example.*Example"/>
     <bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
   </Match>
 
   <Match>
-    <Class name="org.apache.activemq.utils.json.JSONObject$Null"/>
+    <Class name="org.apache.activemq.artemis.utils.json.JSONObject$Null"/>
     <Bug pattern="EQ_UNUSUAL"/>
   </Match>
 
   <Match>
-    <Class name="org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedNothingLiveActivation"/>
+    <Class name="org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl$SharedNothingLiveActivation"/>
     <Method name="isNodeIdUsed"/>
     <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
   </Match>
@@ -158,8 +158,8 @@ under the License.
   <!-- Examples often verify a null value and use the (null) variable in a sys-out statement -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq.jms.example.TopicHierarchyExample"/>
-      <Class name="org.apache.activemq.jms.example.TransactionalExample"/>
+      <Class name="org.apache.activemq.artemis.jms.example.TopicHierarchyExample"/>
+      <Class name="org.apache.activemq.artemis.jms.example.TransactionalExample"/>
     </Or>
     <Method name="runExample"/>
     <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/embedded-remote/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/pom.xml b/examples/core/embedded-remote/pom.xml
index f3085af..8031f87 100644
--- a/examples/core/embedded-remote/pom.xml
+++ b/examples/core/embedded-remote/pom.xml
@@ -24,27 +24,27 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-core-embedded-remote-example</artifactId>
+   <artifactId>artemis-core-embedded-remote-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Core Embedded Remote Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-server</artifactId>
+         <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -63,7 +63,7 @@ under the License.
          <dependencies>
             <dependency>
                <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-server</artifactId>
+               <artifactId>artemis-server</artifactId>
                <version>${project.version}</version>
             </dependency>
          </dependencies>
@@ -82,7 +82,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.core.example.EmbeddedServer</mainClass>
+                     <mainClass>org.apache.activemq.artemis.core.example.EmbeddedServer</mainClass>
                   </configuration>
                </plugin>
             </plugins>
@@ -93,7 +93,7 @@ under the License.
          <dependencies>
             <dependency>
                <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-core-client</artifactId>
+               <artifactId>artemis-core-client</artifactId>
                <version>${project.version}</version>
             </dependency>
          </dependencies>
@@ -112,7 +112,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.core.example.EmbeddedRemoteExample</mainClass>
+                     <mainClass>org.apache.activemq.artemis.core.example.EmbeddedRemoteExample</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
index ed9fa8d..453e40a 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedRemoteExample.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java
index f6500c3..d54b50b 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedServer.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 /**
  * An EmbeddedServer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/embedded/pom.xml b/examples/core/embedded/pom.xml
index 3aed991..e6408ab 100644
--- a/examples/core/embedded/pom.xml
+++ b/examples/core/embedded/pom.xml
@@ -24,27 +24,27 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-core-embedded-example</artifactId>
+   <artifactId>artemis-core-embedded-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Core Embedded Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-server</artifactId>
+         <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -75,7 +75,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.core.example.EmbeddedExample</mainClass>
+                     <mainClass>org.apache.activemq.artemis.core.example.EmbeddedExample</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
index c8d5405..b1017cd 100644
--- a/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
+++ b/examples/core/embedded/src/main/java/org/apache/activemq/artemis/core/example/EmbeddedExample.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.Date;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.server.ActiveMQServer;
-import org.apache.activemq.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/pom.xml b/examples/core/perf/pom.xml
index 23283c8..1605fb7 100644
--- a/examples/core/perf/pom.xml
+++ b/examples/core/perf/pom.xml
@@ -24,22 +24,22 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-core-perf-example</artifactId>
+   <artifactId>artemis-core-perf-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Perf Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -49,7 +49,7 @@ under the License.
       </dependency>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -65,7 +65,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -91,27 +91,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.core</groupId>
-                        <artifactId>activemq-core-perf-example</artifactId>
+                        <artifactId>artemis-core-perf-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
@@ -141,7 +141,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.core.example.PerfListener</mainClass>
+                     <mainClass>org.apache.activemq.artemis.core.example.PerfListener</mainClass>
                   </configuration>
                </plugin>
             </plugins>
@@ -164,7 +164,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.core.example.PerfSender</mainClass>
+                     <mainClass>org.apache.activemq.artemis.core.example.PerfSender</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java
index a6107f1..62a6ec0 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfBase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -26,21 +26,21 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.utils.TokenBucketLimiter;
-import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.utils.TokenBucketLimiter;
+import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java
index ca4b04a..e7c57bc 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java
index 38094b2..48c82b1 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfParams.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java
index 54473e1..070dfd5 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/artemis/core/example/PerfSender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 5f5728f..5ad1f5e 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -23,8 +23,8 @@ under the License.
 
    <parent>
       <groupId>org.apache.activemq.examples</groupId>
-      <artifactId>activemq-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <artifactId>artemis-examples</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
    <groupId>org.apache.activemq.examples.core</groupId>


Mime
View raw message