http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java
index e4a41fc..6c93367 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java
@@ -102,7 +102,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns the period used to check if a client has failed to receive pings 
from the server.
     * <p>
     * Period is in milliseconds, default value is
-    * {@link HornetQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}.
+    * {@link ActiveMQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}.
     *
     * @return the period used to check if a client has failed to receive pings 
from the server
     */
@@ -125,7 +125,7 @@ public interface ServerLocator extends AutoCloseable
     * <p>
     * There is 1 temporary file created for each large message.
     * <p>
-    * Default value is {@link 
HornetQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}.
+    * Default value is {@link 
ActiveMQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}.
     *
     * @return <code>true</code> if consumers created through this factory will 
cache large messages
     * in temporary files, <code>false</code> else
@@ -145,7 +145,7 @@ public interface ServerLocator extends AutoCloseable
     * <p>
     * This TTL determines how long the server will keep a connection alive in 
the absence of any
     * data arriving from the client. Value is in milliseconds, default value is
-    * {@link HornetQClient#DEFAULT_CONNECTION_TTL}.
+    * {@link ActiveMQClient#DEFAULT_CONNECTION_TTL}.
     *
     * @return the connection time-to-live in milliseconds
     */
@@ -166,7 +166,7 @@ public interface ServerLocator extends AutoCloseable
     * <p>
     * If client's blocking calls to the server take more than this timeout, 
the call will throw a
     * {@link org.apache.activemq.api.core.ActiveMQException} with the code 
{@link org.apache.activemq.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. 
Value
-    * is in milliseconds, default value is {@link 
HornetQClient#DEFAULT_CALL_TIMEOUT}.
+    * is in milliseconds, default value is {@link 
ActiveMQClient#DEFAULT_CALL_TIMEOUT}.
     *
     * @return the blocking calls timeout
     */
@@ -210,7 +210,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns the large message size threshold.
     * <p>
     * Messages whose size is if greater than this value will be handled as 
<em>large messages</em>.
-    * Value is in bytes, default value is {@link 
HornetQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}.
+    * Value is in bytes, default value is {@link 
ActiveMQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}.
     *
     * @return the message size threshold to treat messages as large messages.
     */
@@ -229,7 +229,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the window size for flow control of the consumers created 
through this factory.
     * <p>
-    * Value is in bytes, default value is {@link 
HornetQClient#DEFAULT_CONSUMER_WINDOW_SIZE}.
+    * Value is in bytes, default value is {@link 
ActiveMQClient#DEFAULT_CONSUMER_WINDOW_SIZE}.
     *
     * @return the window size used for consumer flow control
     */
@@ -252,7 +252,7 @@ public interface ServerLocator extends AutoCloseable
     * This value controls the rate at which a consumer can consume messages. A 
consumer will never consume messages at a rate faster than the rate specified.
     * <p>
     * Value is -1 (to disable) or a positive integer corresponding to the 
maximum desired message consumption rate specified in units of messages per 
second.
-    * Default value is {@link HornetQClient#DEFAULT_CONSUMER_MAX_RATE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_CONSUMER_MAX_RATE}.
     *
     * @return the consumer max rate
     */
@@ -272,7 +272,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns the size for the confirmation window of clients using this 
factory.
     * <p>
     * Value is in bytes or -1 (to disable the window). Default value is
-    * {@link HornetQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}.
+    * {@link ActiveMQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}.
     *
     * @return the size for the confirmation window of clients using this 
factory
     */
@@ -292,7 +292,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns the window size for flow control of the producers created 
through this factory.
     * <p>
     * Value must be -1 (to disable flow control) or greater than 0 to 
determine the maximum amount of bytes at any give time (to prevent overloading 
the connection).
-    * Default value is {@link HornetQClient#DEFAULT_PRODUCER_WINDOW_SIZE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_PRODUCER_WINDOW_SIZE}.
     *
     * @return the window size for flow control of the producers created 
through this factory.
     */
@@ -314,7 +314,7 @@ public interface ServerLocator extends AutoCloseable
     * This value controls the rate at which a producer can produce messages. A 
producer will never produce messages at a rate faster than the rate specified.
     * <p>
     * Value is -1 (to disable) or a positive integer corresponding to the 
maximum desired message production rate specified in units of messages per 
second.
-    * Default value is {@link HornetQClient#DEFAULT_PRODUCER_MAX_RATE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_PRODUCER_MAX_RATE}.
     *
     * @return maximum rate of message production (in messages per seconds)
     */
@@ -334,7 +334,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns whether consumers created through this factory will block while
     * sending message acknowledgments or do it asynchronously.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}.
     *
     * @return whether consumers will block while sending message
     * acknowledgments or do it asynchronously
@@ -358,7 +358,7 @@ public interface ServerLocator extends AutoCloseable
     * If the session is configured to send durable message asynchronously, the 
client can set a SendAcknowledgementHandler on the ClientSession
     * to be notified once the message has been handled by the server.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}.
+    * Default value is {@link ActiveMQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}.
     *
     * @return whether producers will block while sending persistent messages 
or do it asynchronously
     */
@@ -378,7 +378,7 @@ public interface ServerLocator extends AutoCloseable
     * If the session is configured to send non-durable message asynchronously, 
the client can set a SendAcknowledgementHandler on the ClientSession
     * to be notified once the message has been handled by the server.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}.
+    * Default value is {@link 
ActiveMQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}.
     *
     * @return whether producers will block while sending non-durable messages 
or do it asynchronously
     */
@@ -398,7 +398,7 @@ public interface ServerLocator extends AutoCloseable
     * <p>
     * if <code>true</code>, a random unique group ID is created and set on 
each message for the property
     * {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}.
-    * Default value is {@link HornetQClient#DEFAULT_AUTO_GROUP}.
+    * Default value is {@link ActiveMQClient#DEFAULT_AUTO_GROUP}.
     *
     * @return whether producers will automatically assign a group ID to their 
messages
     */
@@ -433,7 +433,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns whether messages will pre-acknowledged on the server before they 
are sent to the consumers or not.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_PRE_ACKNOWLEDGE}
+    * Default value is {@link ActiveMQClient#DEFAULT_PRE_ACKNOWLEDGE}
     */
    boolean isPreAcknowledge();
 
@@ -451,7 +451,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the acknowledgments batch size.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_ACK_BATCH_SIZE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_ACK_BATCH_SIZE}.
     *
     * @return the acknowledgments batch size
     */
@@ -484,7 +484,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns whether this factory will use global thread pools (shared among 
all the factories in the same JVM)
     * or its own pools.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_USE_GLOBAL_POOLS}.
+    * Default value is {@link ActiveMQClient#DEFAULT_USE_GLOBAL_POOLS}.
     *
     * @return <code>true</code> if this factory uses global thread pools, 
<code>false</code> else
     */
@@ -502,7 +502,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the maximum size of the scheduled thread pool.
     * <p>
-    * Default value is {@link 
HornetQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
+    * Default value is {@link 
ActiveMQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
     *
     * @return the maximum size of the scheduled thread pool.
     */
@@ -522,7 +522,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the maximum size of the thread pool.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_THREAD_POOL_MAX_SIZE}.
+    * Default value is {@link ActiveMQClient#DEFAULT_THREAD_POOL_MAX_SIZE}.
     *
     * @return the maximum size of the thread pool.
     */
@@ -542,7 +542,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the time to retry connections created by this factory after 
failure.
     * <p>
-    * Value is in milliseconds, default is {@link 
HornetQClient#DEFAULT_RETRY_INTERVAL}.
+    * Value is in milliseconds, default is {@link 
ActiveMQClient#DEFAULT_RETRY_INTERVAL}.
     *
     * @return the time to retry connections created by this factory after 
failure
     */
@@ -561,7 +561,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the multiplier to apply to successive retry intervals.
     * <p>
-    * Default value is  {@link 
HornetQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}.
+    * Default value is  {@link 
ActiveMQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}.
     *
     * @return the multiplier to apply to successive retry intervals
     */
@@ -580,7 +580,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the maximum retry interval (in the case a retry interval 
multiplier has been specified).
     * <p>
-    * Value is in milliseconds, default value is  {@link 
HornetQClient#DEFAULT_MAX_RETRY_INTERVAL}.
+    * Value is in milliseconds, default value is  {@link 
ActiveMQClient#DEFAULT_MAX_RETRY_INTERVAL}.
     *
     * @return the maximum retry interval
     */
@@ -600,7 +600,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the maximum number of attempts to retry connection in case of 
failure.
     * <p>
-    * Default value is {@link HornetQClient#DEFAULT_RECONNECT_ATTEMPTS}.
+    * Default value is {@link ActiveMQClient#DEFAULT_RECONNECT_ATTEMPTS}.
     *
     * @return the maximum number of attempts to retry connection in case of 
failure.
     */
@@ -635,7 +635,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns true if the client will automatically attempt to connect to the 
backup server if the initial
     * connection to the live server fails
     * <p>
-    * Default value is {@link 
HornetQClient#DEFAULT_FAILOVER_ON_INITIAL_CONNECTION}.
+    * Default value is {@link 
ActiveMQClient#DEFAULT_FAILOVER_ON_INITIAL_CONNECTION}.
     */
    boolean isFailoverOnInitialConnection();
 
@@ -669,7 +669,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the initial size of messages created through this factory.
     * <p>
-    * Value is in bytes, default value is  {@link 
HornetQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}.
+    * Value is in bytes, default value is  {@link 
ActiveMQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}.
     *
     * @return the initial size of messages created through this factory
     */
@@ -690,7 +690,7 @@ public interface ServerLocator extends AutoCloseable
     * method is the same as invoking 
<code>addIncomingInterceptor(Interceptor).</code>
     *
     * @param interceptor an Interceptor
-    * @deprecated As of HornetQ 2.3.0.Final, replaced by
+    * @deprecated As of ActiveMQ 2.3.0.Final, replaced by
     * {@link #addIncomingInterceptor(Interceptor)} and
     * {@link #addOutgoingInterceptor(Interceptor)}
     */
@@ -719,7 +719,7 @@ public interface ServerLocator extends AutoCloseable
     *
     * @param interceptor interceptor to remove
     * @return <code>true</code> if the interceptor is removed from this 
factory, <code>false</code> else
-    * @deprecated As of HornetQ 2.3.0.Final, replaced by
+    * @deprecated As of ActiveMQ 2.3.0.Final, replaced by
     * {@link #removeIncomingInterceptor(Interceptor)} and
     * {@link #removeOutgoingInterceptor(Interceptor)}
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java
index d9f059e..4846887 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/loadbalance/package-info.java
@@ -14,8 +14,8 @@
  * Client load-balancing API.
  * <br>
  * This package defines the policies supported by
- * HornetQ to load-balance client connections across
- * HornetQ servers.
+ * ActiveMQ to load-balance client connections across
+ * ActiveMQ servers.
  */
 package org.apache.activemq.api.core.client.loadbalance;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java
index d76a779..9cdc0ae 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/package-info.java
@@ -13,7 +13,7 @@
 /**
  * Core Client Messaging API.
  * <br>
- * This package defines the API used by HornetQ clients to produce and consume 
messages.
+ * This package defines the API used by ActiveMQ clients to produce and 
consume messages.
  */
 package org.apache.activemq.api.core.client;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java
index 4f05cac..c322924 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/AcceptorControl.java
@@ -21,7 +21,7 @@ import java.util.Map;
  *
  * @see Acceptor
  */
-public interface AcceptorControl extends HornetQComponentControl
+public interface AcceptorControl extends ActiveMQComponentControl
 {
    /**
     * Returns the name of the acceptor

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java
new file mode 100644
index 0000000..e701849
--- /dev/null
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQComponentControl.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.api.core.management;
+
+/**
+ * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ 
component.
+ *
+ * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a>
+ */
+public interface ActiveMQComponentControl
+{
+   /**
+    * Returns {@code true} if this component is started, {@code false} else.
+    */
+   boolean isStarted();
+
+   /**
+    * Starts this component.
+    */
+   void start() throws Exception;
+
+   /**
+    * Stops this component.
+    */
+   void stop() throws Exception;
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java
new file mode 100644
index 0000000..cb8c226
--- /dev/null
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ActiveMQServerControl.java
@@ -0,0 +1,621 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.api.core.management;
+
+import javax.management.MBeanOperationInfo;
+
+/**
+ * A ActiveMQServerControl is used to manage ActiveMQ servers.
+ */
+public interface ActiveMQServerControl
+{
+   /**
+    * Returns this server's version.
+    */
+   String getVersion();
+
+   /**
+    * Returns the number of connections connected to this server.
+    */
+   int getConnectionCount();
+
+   /**
+    * Return whether this server is started.
+    */
+   boolean isStarted();
+
+   /**
+    * Returns the list of interceptors used by this server. Invoking this 
method is the same as invoking
+    * <code>getIncomingInterceptorClassNames().</code>
+    *
+    * @see org.apache.activemq.api.core.Interceptor
+    * @deprecated As of ActiveMQ 2.3.0.Final, replaced by
+    * {@link #getIncomingInterceptorClassNames()} and
+    * {@link #getOutgoingInterceptorClassNames()}
+    */
+   @Deprecated
+   String[] getInterceptorClassNames();
+
+   /**
+    * Returns the list of interceptors used by this server for incoming 
messages.
+    *
+    * @see org.apache.activemq.api.core.Interceptor
+    */
+   String[] getIncomingInterceptorClassNames();
+
+   /**
+    * Returns the list of interceptors used by this server for outgoing 
messages.
+    *
+    * @see org.apache.activemq.api.core.Interceptor
+    */
+   String[] getOutgoingInterceptorClassNames();
+
+   /**
+    * Returns whether this server is clustered.
+    */
+   boolean isClustered();
+
+   /**
+    * Returns the maximum number of threads in the <em>scheduled</em> thread 
pool.
+    */
+   int getScheduledThreadPoolMaxSize();
+
+   /**
+    * Returns the maximum number of threads in the thread pool.
+    */
+   int getThreadPoolMaxSize();
+
+   /**
+    * Returns the interval time (in milliseconds) to invalidate security 
credentials.
+    */
+   long getSecurityInvalidationInterval();
+
+   /**
+    * Returns whether security is enabled for this server.
+    */
+   boolean isSecurityEnabled();
+
+   /**
+    * Returns the file system directory used to store bindings.
+    */
+   String getBindingsDirectory();
+
+   /**
+    * Returns the file system directory used to store journal log.
+    */
+   String getJournalDirectory();
+
+   /**
+    * Returns the type of journal used by this server (either {@code NIO} or 
{@code ASYNCIO}).
+    */
+   String getJournalType();
+
+   /**
+    * Returns whether the journal is synchronized when receiving transactional 
data.
+    */
+   boolean isJournalSyncTransactional();
+
+   /**
+    * Returns whether the journal is synchronized when receiving 
non-transactional data.
+    */
+   boolean isJournalSyncNonTransactional();
+
+   /**
+    * Returns the size (in bytes) of each journal files.
+    */
+   int getJournalFileSize();
+
+   /**
+    * Returns the number of journal files to pre-create.
+    */
+   int getJournalMinFiles();
+
+   /**
+    * Returns the maximum number of write requests that can be in the AIO 
queue at any given time.
+    */
+   int getJournalMaxIO();
+
+   /**
+    * Returns the size of the internal buffer on the journal.
+    */
+   int getJournalBufferSize();
+
+   /**
+    * Returns the timeout (in nanoseconds) used to flush internal buffers on 
the journal.
+    */
+   int getJournalBufferTimeout();
+
+   /**
+    * do any clients failover on a server shutdown
+    */
+   void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) throws 
Exception;
+
+
+   /**
+    * returns if clients failover on a server shutdown
+    */
+   boolean isFailoverOnServerShutdown();
+
+   /**
+    * Returns the minimal number of journal files before compacting.
+    */
+   int getJournalCompactMinFiles();
+
+   /**
+    * Return the percentage of live data before compacting the journal.
+    */
+   int getJournalCompactPercentage();
+
+   /**
+    * Returns whether this server is using persistence and store data.
+    */
+   boolean isPersistenceEnabled();
+
+   /**
+    * Returns whether the bindings directory is created on this server startup.
+    */
+   boolean isCreateBindingsDir();
+
+   /**
+    * Returns whether the journal directory is created on this server startup.
+    */
+   boolean isCreateJournalDir();
+
+   /**
+    * Returns whether message counter is enabled for this server.
+    */
+   boolean isMessageCounterEnabled();
+
+   /**
+    * Returns the maximum number of days kept in memory for message counter.
+    */
+   int getMessageCounterMaxDayCount();
+
+   /**
+    * Sets the maximum number of days kept in memory for message counter.
+    *
+    * @param count value must be greater than 0
+    */
+   void setMessageCounterMaxDayCount(int count) throws Exception;
+
+   /**
+    * Returns the sample period (in milliseconds) to take message counter 
snapshot.
+    */
+   long getMessageCounterSamplePeriod();
+
+   /**
+    * Sets the sample period to take message counter snapshot.
+    *
+    * @param newPeriod value must be greater than 1000ms
+    */
+   void setMessageCounterSamplePeriod(long newPeriod) throws Exception;
+
+   /**
+    * Returns {@code true} if this server is a backup, {@code false} if it is 
a live server.
+    * <br>
+    * If a backup server has been activated, returns {@code false}.
+    */
+   boolean isBackup();
+
+   /**
+    * Returns whether this server shares its data store with a corresponding 
live or backup server.
+    */
+   boolean isSharedStore();
+
+   /**
+    * Returns the file system directory used to store paging files.
+    */
+   String getPagingDirectory();
+
+   /**
+    * Returns whether delivery count is persisted before messages are 
delivered to the consumers.
+    */
+   boolean isPersistDeliveryCountBeforeDelivery();
+
+   /**
+    * Returns the connection time to live.
+    * <br>
+    * This value overrides the connection time to live <em>sent by the 
client</em>.
+    */
+   long getConnectionTTLOverride();
+
+   /**
+    * Returns the management address of this server.
+    * <br>
+    * Clients can send management messages to this address to manage this 
server.
+    */
+   String getManagementAddress();
+
+   /**
+    * Returns the management notification address of this server.
+    * <br>
+    * Clients can bind queues to this address to receive management 
notifications emitted by this server.
+    */
+   String getManagementNotificationAddress();
+
+   /**
+    * Returns the size of the cache for pre-creating message IDs.
+    */
+   int getIDCacheSize();
+
+   /**
+    * Returns whether message ID cache is persisted.
+    */
+   boolean isPersistIDCache();
+
+   /**
+    * Returns the file system directory used to store large messages.
+    */
+   String getLargeMessagesDirectory();
+
+   /**
+    * Returns whether wildcard routing is supported by this server.
+    */
+   boolean isWildcardRoutingEnabled();
+
+   /**
+    * Returns the timeout (in milliseconds) after which transactions is removed
+    * from the resource manager after it was created.
+    */
+   long getTransactionTimeout();
+
+   /**
+    * Returns the frequency (in milliseconds)  to scan transactions to detect 
which transactions
+    * have timed out.
+    */
+   long getTransactionTimeoutScanPeriod();
+
+   /**
+    * Returns the frequency (in milliseconds)  to scan messages to detect 
which messages
+    * have expired.
+    */
+   long getMessageExpiryScanPeriod();
+
+   /**
+    * Returns the priority of the thread used to scan message expiration.
+    */
+   long getMessageExpiryThreadPriority();
+
+   /**
+    * Returns whether code coming from connection is executed asynchronously 
or not.
+    */
+   boolean isAsyncConnectionExecutionEnabled();
+
+   /**
+    * Returns the connectors configured for this server.
+    */
+   Object[] getConnectors() throws Exception;
+
+   /**
+    * Returns the connectors configured for this server using JSON 
serialization.
+    */
+   String getConnectorsAsJSON() throws Exception;
+
+   /**
+    * Returns the addresses created on this server.
+    */
+   String[] getAddressNames();
+
+   /**
+    * Returns the names of the queues created on this server.
+    */
+   String[] getQueueNames();
+
+   // Operations ----------------------------------------------------
+
+   /**
+    * Create a durable queue.
+    * <br>
+    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
+    *
+    * @param address address to bind the queue to
+    * @param name    name of the queue
+    */
+   @Operation(desc = "Create a queue with the specified address", impact = 
MBeanOperationInfo.ACTION)
+   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
+                    @Parameter(name = "name", desc = "Name of the queue") 
String name) throws Exception;
+
+   /**
+    * Create a queue.
+    * <br>
+    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
+    *
+    * @param address address to bind the queue to
+    * @param name    name of the queue
+    * @param filter  of the queue
+    * @param durable whether the queue is durable
+    */
+   @Operation(desc = "Create a queue", impact = MBeanOperationInfo.ACTION)
+   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
+                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
+                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter,
+                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
+
+   /**
+    * Create a queue.
+    * <br>
+    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
+    *
+    * @param address address to bind the queue to
+    * @param name    name of the queue
+    * @param durable whether the queue is durable
+    */
+   @Operation(desc = "Create a queue with the specified address, name and 
durability", impact = MBeanOperationInfo.ACTION)
+   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
+                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
+                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
+
+   /**
+    * Deploy a durable queue.
+    * <br>
+    * This method will do nothing if the queue with the given name already 
exists on the server.
+    *
+    * @param address address to bind the queue to
+    * @param name    name of the queue
+    * @param filter  of the queue
+    */
+   @Operation(desc = "Deploy a queue", impact = MBeanOperationInfo.ACTION)
+   void deployQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
+                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
+                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter) throws Exception;
+
+   /**
+    * Deploy a queue.
+    * <br>
+    * This method will do nothing if the queue with the given name already 
exists on the server.
+    *
+    * @param address address to bind the queue to
+    * @param name    name of the queue
+    * @param filter  of the queue
+    * @param durable whether the queue is durable
+    */
+   @Operation(desc = "Deploy a queue", impact = MBeanOperationInfo.ACTION)
+   void deployQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
+                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
+                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter,
+                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
+
+   /**
+    * Destroys the queue corresponding to the specified name.
+    */
+   @Operation(desc = "Destroy a queue", impact = MBeanOperationInfo.ACTION)
+   void destroyQueue(@Parameter(name = "name", desc = "Name of the queue to 
destroy") String name) throws Exception;
+
+   /**
+    * Enables message counters for this server.
+    */
+   @Operation(desc = "Enable message counters", impact = 
MBeanOperationInfo.ACTION)
+   void enableMessageCounters() throws Exception;
+
+   /**
+    * Disables message counters for this server.
+    */
+   @Operation(desc = "Disable message counters", impact = 
MBeanOperationInfo.ACTION)
+   void disableMessageCounters() throws Exception;
+
+   /**
+    * Reset all message counters.
+    */
+   @Operation(desc = "Reset all message counters", impact = 
MBeanOperationInfo.ACTION)
+   void resetAllMessageCounters() throws Exception;
+
+   /**
+    * Reset histories for all message counters.
+    */
+   @Operation(desc = "Reset all message counters history", impact = 
MBeanOperationInfo.ACTION)
+   void resetAllMessageCounterHistories() throws Exception;
+
+   /**
+    * List all the prepared transaction, sorted by date, oldest first.
+    * <br>
+    * The Strings are Base-64 representation of the transaction XID and can be
+    * used to heuristically commit or rollback the transactions.
+    *
+    * @see #commitPreparedTransaction(String)
+    * @see #rollbackPreparedTransaction(String)
+    */
+   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first")
+   String[] listPreparedTransactions() throws Exception;
+
+   /**
+    * List all the prepared transaction, sorted by date,
+    * oldest first, with details, in text format.
+    */
+   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first, with details, in JSON format")
+   String listPreparedTransactionDetailsAsJSON() throws Exception;
+
+   /**
+    * List all the prepared transaction, sorted by date,
+    * oldest first, with details, in HTML format
+    */
+   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first, with details, in HTML format")
+   String listPreparedTransactionDetailsAsHTML() throws Exception;
+
+   /**
+    * List transactions which have been heuristically committed.
+    */
+   String[] listHeuristicCommittedTransactions() throws Exception;
+
+   /**
+    * List transactions which have been heuristically rolled back.
+    */
+   String[] listHeuristicRolledBackTransactions() throws Exception;
+
+   /**
+    * Heuristically commits a prepared transaction.
+    *
+    * @param transactionAsBase64 base 64 representation of a prepare 
transaction
+    * @return {@code true} if the transaction was successfully committed, 
{@code false} else
+    * @see #listPreparedTransactions()
+    */
+   @Operation(desc = "Commit a prepared transaction")
+   boolean commitPreparedTransaction(@Parameter(desc = "the Base64 
representation of a transaction", name = "transactionAsBase64") String 
transactionAsBase64) throws Exception;
+
+   /**
+    * Heuristically rolls back a prepared transaction.
+    *
+    * @param transactionAsBase64 base 64 representation of a prepare 
transaction
+    * @return {@code true} if the transaction was successfully rolled back, 
{@code false} else
+    * @see #listPreparedTransactions()
+    */
+   @Operation(desc = "Rollback a prepared transaction")
+   boolean rollbackPreparedTransaction(@Parameter(desc = "the Base64 
representation of a transaction", name = "transactionAsBase64") String 
transactionAsBase64) throws Exception;
+
+   /**
+    * Lists the addresses of all the clients connected to this address.
+    */
+   @Operation(desc = "List the client addresses", impact = 
MBeanOperationInfo.INFO)
+   String[] listRemoteAddresses() throws Exception;
+
+   /**
+    * Lists the addresses of the clients connected to this address which 
matches the specified IP address.
+    */
+   @Operation(desc = "List the client addresses which match the given IP 
Address", impact = MBeanOperationInfo.INFO)
+   String[] listRemoteAddresses(@Parameter(desc = "an IP address", name = 
"ipAddress") String ipAddress) throws Exception;
+
+   /**
+    * Closes all the connections of clients connected to this server which 
matches the specified IP address.
+    */
+   @Operation(desc = "Closes all the connections for the given IP Address", 
impact = MBeanOperationInfo.INFO)
+   boolean closeConnectionsForAddress(@Parameter(desc = "an IP address", name 
= "ipAddress") String ipAddress) throws Exception;
+
+   /**
+    * Closes all the connections of clients connected to this server which 
matches the specified IP address.
+    */
+   @Operation(desc = "Closes all the consumer connections for the given 
ActiveMQ address", impact = MBeanOperationInfo.INFO)
+   boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a ActiveMQ 
address", name = "address") String address) throws Exception;
+
+   /**
+    * Closes all the connections of sessions with a matching user name.
+    */
+   @Operation(desc = "Closes all the connections for sessions with the given 
user name", impact = MBeanOperationInfo.INFO)
+   boolean closeConnectionsForUser(@Parameter(desc = "a user name", name = 
"userName") String address) throws Exception;
+
+   /**
+    * Lists all the IDs of the connections connected to this server.
+    */
+   @Operation(desc = "List all the connection IDs", impact = 
MBeanOperationInfo.INFO)
+   String[] listConnectionIDs() throws Exception;
+
+   String listProducersInfoAsJSON() throws Exception;
+
+   /**
+    * Lists all the sessions IDs for the specified connection ID.
+    */
+   @Operation(desc = "List the sessions for the given connectionID", impact = 
MBeanOperationInfo.INFO)
+   String[] listSessions(@Parameter(desc = "a connection ID", name = 
"connectionID") String connectionID) throws Exception;
+
+   /**
+    * This method is used by ActiveMQ clustering and must not be called by 
ActiveMQ clients.
+    */
+   void sendQueueInfoToQueue(String queueName, String address) throws 
Exception;
+
+   @Operation(desc = "Add security settings for addresses matching the 
addressMatch", impact = MBeanOperationInfo.ACTION)
+   void addSecuritySettings(
+      @Parameter(desc = "an address match", name = "addressMatch") String 
addressMatch,
+      @Parameter(desc = "a comma-separated list of roles allowed to send 
messages", name = "send") String sendRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to consume 
messages", name = "consume") String consumeRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to create 
durable queues", name = "createDurableQueueRoles") String 
createDurableQueueRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to delete 
durable queues", name = "deleteDurableQueueRoles") String 
deleteDurableQueueRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to create non 
durable queues", name = "createNonDurableQueueRoles") String 
createNonDurableQueueRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to delete non 
durable queues", name = "deleteNonDurableQueueRoles") String 
deleteNonDurableQueueRoles,
+      @Parameter(desc = "a comma-separated list of roles allowed to send 
management messages messages", name = "manage") String manageRoles) throws 
Exception;
+
+   @Operation(desc = "Remove security settings for an address", impact = 
MBeanOperationInfo.ACTION)
+   void removeSecuritySettings(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
+
+   @Operation(desc = "get roles for a specific address match", impact = 
MBeanOperationInfo.INFO)
+   Object[] getRoles(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
+
+   @Operation(desc = "get roles (as a JSON string) for a specific address 
match", impact = MBeanOperationInfo.INFO)
+   String getRolesAsJSON(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
+
+   /**
+    * adds a new address setting for a specific address
+    */
+   @Operation(desc = "Add address settings for addresses matching the 
addressMatch", impact = MBeanOperationInfo.ACTION)
+   void addAddressSettings(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch,
+                           @Parameter(desc = "the dead letter address 
setting", name = "DLA") String DLA,
+                           @Parameter(desc = "the expiry address setting", 
name = "expiryAddress") String expiryAddress,
+                           @Parameter(desc = "the expiry delay setting", name 
= "expiryDelay") long expiryDelay,
+                           @Parameter(desc = "are any queues created for this 
address a last value queue", name = "lastValueQueue") boolean lastValueQueue,
+                           @Parameter(desc = "the delivery attempts", name = 
"deliveryAttempts") int deliveryAttempts,
+                           @Parameter(desc = "the max size in bytes", name = 
"maxSizeBytes") long maxSizeBytes,
+                           @Parameter(desc = "the page size in bytes", name = 
"pageSizeBytes") int pageSizeBytes,
+                           @Parameter(desc = "the max number of pages in the 
soft memory cache", name = "pageMaxCacheSize") int pageMaxCacheSize,
+                           @Parameter(desc = "the redelivery delay", name = 
"redeliveryDelay") long redeliveryDelay,
+                           @Parameter(desc = "the redelivery delay 
multiplier", name = "redeliveryMultiplier") double redeliveryMultiplier,
+                           @Parameter(desc = "the maximum redelivery delay", 
name = "maxRedeliveryDelay") long maxRedeliveryDelay,
+                           @Parameter(desc = "the redistribution delay", name 
= "redistributionDelay") long redistributionDelay,
+                           @Parameter(desc = "do we send to the DLA when there 
is no where to route the message", name = "sendToDLAOnNoRoute") boolean 
sendToDLAOnNoRoute,
+                           @Parameter(desc = "the policy to use when the 
address is full", name = "addressFullMessagePolicy") String 
addressFullMessagePolicy,
+                           @Parameter(desc = "when a consumer falls below this 
threshold in terms of messages consumed per second it will be considered 
'slow'", name = "slowConsumerThreshold") long slowConsumerThreshold,
+                           @Parameter(desc = "how often (in seconds) to check 
for slow consumers", name = "slowConsumerCheckPeriod") long 
slowConsumerCheckPeriod,
+                           @Parameter(desc = "the policy to use when a slow 
consumer is detected", name = "slowConsumerPolicy") String slowConsumerPolicy) 
throws Exception;
+
+   void removeAddressSettings(String addressMatch) throws Exception;
+
+   /**
+    * returns the address settings as a JSON string
+    */
+   @Operation(desc = "returns the address settings as a JSON string for an 
address match", impact = MBeanOperationInfo.INFO)
+   String getAddressSettingsAsJSON(@Parameter(desc = "an address match", name 
= "addressMatch") String addressMatch) throws Exception;
+
+   String[] getDivertNames();
+
+   @Operation(desc = "Create a Divert", impact = MBeanOperationInfo.ACTION)
+   void createDivert(@Parameter(name = "name", desc = "Name of the divert") 
String name,
+                     @Parameter(name = "routingName", desc = "Routing name of 
the divert") String routingName,
+                     @Parameter(name = "address", desc = "Address to divert 
from") String address,
+                     @Parameter(name = "forwardingAddress", desc = "Address to 
divert to") String forwardingAddress,
+                     @Parameter(name = "exclusive", desc = "Is the divert 
exclusive?") boolean exclusive,
+                     @Parameter(name = "filterString", desc = "Filter of the 
divert") String filterString,
+                     @Parameter(name = "transformerClassName", desc = "Class 
name of the divert's transformer") String transformerClassName) throws 
Exception;
+
+   @Operation(desc = "Destroy a Divert", impact = MBeanOperationInfo.ACTION)
+   void destroyDivert(@Parameter(name = "name", desc = "Name of the divert") 
String name) throws Exception;
+
+   String[] getBridgeNames();
+
+   @Operation(desc = "Create a Bridge", impact = MBeanOperationInfo.ACTION)
+   void createBridge(@Parameter(name = "name", desc = "Name of the bridge") 
String name,
+                     @Parameter(name = "queueName", desc = "Name of the source 
queue") String queueName,
+                     @Parameter(name = "forwardingAddress", desc = "Forwarding 
address") String forwardingAddress,
+                     @Parameter(name = "filterString", desc = "Filter of the 
brdige") String filterString,
+                     @Parameter(name = "transformerClassName", desc = "Class 
name of the bridge transformer") String transformerClassName,
+                     @Parameter(name = "retryInterval", desc = "Connection 
retry interval") long retryInterval,
+                     @Parameter(name = "retryIntervalMultiplier", desc = 
"Connection retry interval multiplier") double retryIntervalMultiplier,
+                     @Parameter(name = "initialConnectAttempts", desc = 
"Number of initial connection attempts") int initialConnectAttempts,
+                     @Parameter(name = "reconnectAttempts", desc = "Number of 
reconnection attempts") int reconnectAttempts,
+                     @Parameter(name = "useDuplicateDetection", desc = "Use 
duplicate detection") boolean useDuplicateDetection,
+                     @Parameter(name = "confirmationWindowSize", desc = 
"Confirmation window size") int confirmationWindowSize,
+                     @Parameter(name = "clientFailureCheckPeriod", desc = 
"Period to check client failure") long clientFailureCheckPeriod,
+                     @Parameter(name = "staticConnectorNames", desc = "comma 
separated list of connector names or name of discovery group if 
'useDiscoveryGroup' is set to true") String connectorNames,
+                     @Parameter(name = "useDiscoveryGroup", desc = "use 
discovery  group") boolean useDiscoveryGroup,
+                     @Parameter(name = "ha", desc = "Is it using HA") boolean 
ha,
+                     @Parameter(name = "user", desc = "User name") String user,
+                     @Parameter(name = "password", desc = "User password") 
String password) throws Exception;
+
+
+   @Operation(desc = "Destroy a bridge", impact = MBeanOperationInfo.ACTION)
+   void destroyBridge(@Parameter(name = "name", desc = "Name of the bridge") 
String name) throws Exception;
+
+   @Operation(desc = "force the server to stop and notify clients to 
failover", impact = MBeanOperationInfo.UNKNOWN)
+   void forceFailover() throws Exception;
+
+   void updateDuplicateIdCache(String address, Object[] ids) throws Exception;
+
+   @Operation(desc = "force the server to stop and to scale down to another 
server", impact = MBeanOperationInfo.UNKNOWN)
+   void scaleDown(@Parameter(name = "name", desc = "The connector to use to 
scale down, if not provided the first appropriate connector will be 
used")String connector) throws Exception;
+}
+

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java
index 938107c..1950837 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BridgeControl.java
@@ -19,7 +19,7 @@ package org.apache.activemq.api.core.management;
  * @author <a href="jmes...@redhat.com">Jeff Mesnil</a>
  *
  */
-public interface BridgeControl extends HornetQComponentControl
+public interface BridgeControl extends ActiveMQComponentControl
 {
    /**
     * Returns the name of this bridge

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java
index 2d857bd..0ace7d0 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/BroadcastGroupControl.java
@@ -18,7 +18,7 @@ package org.apache.activemq.api.core.management;
  * @author <a href="jmes...@redhat.com">Jeff Mesnil</a>
  *
  */
-public interface BroadcastGroupControl extends HornetQComponentControl
+public interface BroadcastGroupControl extends ActiveMQComponentControl
 {
    /**
     * Returns the configuration name of this broadcast group.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java
index 8942f13..f2fe3e2 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ClusterConnectionControl.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * @author <a href="jmes...@redhat.com">Jeff Mesnil</a>
  *
  */
-public interface ClusterConnectionControl extends HornetQComponentControl
+public interface ClusterConnectionControl extends ActiveMQComponentControl
 {
    /**
     * Returns the configuration name of this cluster connection.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java
deleted file mode 100644
index 6733264..0000000
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQComponentControl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.api.core.management;
-
-/**
- * A HornetQComponentControl is used to manage the life cycle of a HornetQ 
component.
- *
- * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a>
- */
-public interface HornetQComponentControl
-{
-   /**
-    * Returns {@code true} if this component is started, {@code false} else.
-    */
-   boolean isStarted();
-
-   /**
-    * Starts this component.
-    */
-   void start() throws Exception;
-
-   /**
-    * Stops this component.
-    */
-   void stop() throws Exception;
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java
deleted file mode 100644
index 8da629c..0000000
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.  See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.api.core.management;
-
-import javax.management.MBeanOperationInfo;
-
-/**
- * A HornetQServerControl is used to manage HornetQ servers.
- */
-public interface HornetQServerControl
-{
-   /**
-    * Returns this server's version.
-    */
-   String getVersion();
-
-   /**
-    * Returns the number of connections connected to this server.
-    */
-   int getConnectionCount();
-
-   /**
-    * Return whether this server is started.
-    */
-   boolean isStarted();
-
-   /**
-    * Returns the list of interceptors used by this server. Invoking this 
method is the same as invoking
-    * <code>getIncomingInterceptorClassNames().</code>
-    *
-    * @see org.apache.activemq.api.core.Interceptor
-    * @deprecated As of HornetQ 2.3.0.Final, replaced by
-    * {@link #getIncomingInterceptorClassNames()} and
-    * {@link #getOutgoingInterceptorClassNames()}
-    */
-   @Deprecated
-   String[] getInterceptorClassNames();
-
-   /**
-    * Returns the list of interceptors used by this server for incoming 
messages.
-    *
-    * @see org.apache.activemq.api.core.Interceptor
-    */
-   String[] getIncomingInterceptorClassNames();
-
-   /**
-    * Returns the list of interceptors used by this server for outgoing 
messages.
-    *
-    * @see org.apache.activemq.api.core.Interceptor
-    */
-   String[] getOutgoingInterceptorClassNames();
-
-   /**
-    * Returns whether this server is clustered.
-    */
-   boolean isClustered();
-
-   /**
-    * Returns the maximum number of threads in the <em>scheduled</em> thread 
pool.
-    */
-   int getScheduledThreadPoolMaxSize();
-
-   /**
-    * Returns the maximum number of threads in the thread pool.
-    */
-   int getThreadPoolMaxSize();
-
-   /**
-    * Returns the interval time (in milliseconds) to invalidate security 
credentials.
-    */
-   long getSecurityInvalidationInterval();
-
-   /**
-    * Returns whether security is enabled for this server.
-    */
-   boolean isSecurityEnabled();
-
-   /**
-    * Returns the file system directory used to store bindings.
-    */
-   String getBindingsDirectory();
-
-   /**
-    * Returns the file system directory used to store journal log.
-    */
-   String getJournalDirectory();
-
-   /**
-    * Returns the type of journal used by this server (either {@code NIO} or 
{@code ASYNCIO}).
-    */
-   String getJournalType();
-
-   /**
-    * Returns whether the journal is synchronized when receiving transactional 
data.
-    */
-   boolean isJournalSyncTransactional();
-
-   /**
-    * Returns whether the journal is synchronized when receiving 
non-transactional data.
-    */
-   boolean isJournalSyncNonTransactional();
-
-   /**
-    * Returns the size (in bytes) of each journal files.
-    */
-   int getJournalFileSize();
-
-   /**
-    * Returns the number of journal files to pre-create.
-    */
-   int getJournalMinFiles();
-
-   /**
-    * Returns the maximum number of write requests that can be in the AIO 
queue at any given time.
-    */
-   int getJournalMaxIO();
-
-   /**
-    * Returns the size of the internal buffer on the journal.
-    */
-   int getJournalBufferSize();
-
-   /**
-    * Returns the timeout (in nanoseconds) used to flush internal buffers on 
the journal.
-    */
-   int getJournalBufferTimeout();
-
-   /**
-    * do any clients failover on a server shutdown
-    */
-   void setFailoverOnServerShutdown(boolean failoverOnServerShutdown) throws 
Exception;
-
-
-   /**
-    * returns if clients failover on a server shutdown
-    */
-   boolean isFailoverOnServerShutdown();
-
-   /**
-    * Returns the minimal number of journal files before compacting.
-    */
-   int getJournalCompactMinFiles();
-
-   /**
-    * Return the percentage of live data before compacting the journal.
-    */
-   int getJournalCompactPercentage();
-
-   /**
-    * Returns whether this server is using persistence and store data.
-    */
-   boolean isPersistenceEnabled();
-
-   /**
-    * Returns whether the bindings directory is created on this server startup.
-    */
-   boolean isCreateBindingsDir();
-
-   /**
-    * Returns whether the journal directory is created on this server startup.
-    */
-   boolean isCreateJournalDir();
-
-   /**
-    * Returns whether message counter is enabled for this server.
-    */
-   boolean isMessageCounterEnabled();
-
-   /**
-    * Returns the maximum number of days kept in memory for message counter.
-    */
-   int getMessageCounterMaxDayCount();
-
-   /**
-    * Sets the maximum number of days kept in memory for message counter.
-    *
-    * @param count value must be greater than 0
-    */
-   void setMessageCounterMaxDayCount(int count) throws Exception;
-
-   /**
-    * Returns the sample period (in milliseconds) to take message counter 
snapshot.
-    */
-   long getMessageCounterSamplePeriod();
-
-   /**
-    * Sets the sample period to take message counter snapshot.
-    *
-    * @param newPeriod value must be greater than 1000ms
-    */
-   void setMessageCounterSamplePeriod(long newPeriod) throws Exception;
-
-   /**
-    * Returns {@code true} if this server is a backup, {@code false} if it is 
a live server.
-    * <br>
-    * If a backup server has been activated, returns {@code false}.
-    */
-   boolean isBackup();
-
-   /**
-    * Returns whether this server shares its data store with a corresponding 
live or backup server.
-    */
-   boolean isSharedStore();
-
-   /**
-    * Returns the file system directory used to store paging files.
-    */
-   String getPagingDirectory();
-
-   /**
-    * Returns whether delivery count is persisted before messages are 
delivered to the consumers.
-    */
-   boolean isPersistDeliveryCountBeforeDelivery();
-
-   /**
-    * Returns the connection time to live.
-    * <br>
-    * This value overrides the connection time to live <em>sent by the 
client</em>.
-    */
-   long getConnectionTTLOverride();
-
-   /**
-    * Returns the management address of this server.
-    * <br>
-    * Clients can send management messages to this address to manage this 
server.
-    */
-   String getManagementAddress();
-
-   /**
-    * Returns the management notification address of this server.
-    * <br>
-    * Clients can bind queues to this address to receive management 
notifications emitted by this server.
-    */
-   String getManagementNotificationAddress();
-
-   /**
-    * Returns the size of the cache for pre-creating message IDs.
-    */
-   int getIDCacheSize();
-
-   /**
-    * Returns whether message ID cache is persisted.
-    */
-   boolean isPersistIDCache();
-
-   /**
-    * Returns the file system directory used to store large messages.
-    */
-   String getLargeMessagesDirectory();
-
-   /**
-    * Returns whether wildcard routing is supported by this server.
-    */
-   boolean isWildcardRoutingEnabled();
-
-   /**
-    * Returns the timeout (in milliseconds) after which transactions is removed
-    * from the resource manager after it was created.
-    */
-   long getTransactionTimeout();
-
-   /**
-    * Returns the frequency (in milliseconds)  to scan transactions to detect 
which transactions
-    * have timed out.
-    */
-   long getTransactionTimeoutScanPeriod();
-
-   /**
-    * Returns the frequency (in milliseconds)  to scan messages to detect 
which messages
-    * have expired.
-    */
-   long getMessageExpiryScanPeriod();
-
-   /**
-    * Returns the priority of the thread used to scan message expiration.
-    */
-   long getMessageExpiryThreadPriority();
-
-   /**
-    * Returns whether code coming from connection is executed asynchronously 
or not.
-    */
-   boolean isAsyncConnectionExecutionEnabled();
-
-   /**
-    * Returns the connectors configured for this server.
-    */
-   Object[] getConnectors() throws Exception;
-
-   /**
-    * Returns the connectors configured for this server using JSON 
serialization.
-    */
-   String getConnectorsAsJSON() throws Exception;
-
-   /**
-    * Returns the addresses created on this server.
-    */
-   String[] getAddressNames();
-
-   /**
-    * Returns the names of the queues created on this server.
-    */
-   String[] getQueueNames();
-
-   // Operations ----------------------------------------------------
-
-   /**
-    * Create a durable queue.
-    * <br>
-    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
-    *
-    * @param address address to bind the queue to
-    * @param name    name of the queue
-    */
-   @Operation(desc = "Create a queue with the specified address", impact = 
MBeanOperationInfo.ACTION)
-   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
-                    @Parameter(name = "name", desc = "Name of the queue") 
String name) throws Exception;
-
-   /**
-    * Create a queue.
-    * <br>
-    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
-    *
-    * @param address address to bind the queue to
-    * @param name    name of the queue
-    * @param filter  of the queue
-    * @param durable whether the queue is durable
-    */
-   @Operation(desc = "Create a queue", impact = MBeanOperationInfo.ACTION)
-   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
-                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
-                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter,
-                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
-
-   /**
-    * Create a queue.
-    * <br>
-    * This method throws a {@link 
org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the 
queue already exits.
-    *
-    * @param address address to bind the queue to
-    * @param name    name of the queue
-    * @param durable whether the queue is durable
-    */
-   @Operation(desc = "Create a queue with the specified address, name and 
durability", impact = MBeanOperationInfo.ACTION)
-   void createQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
-                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
-                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
-
-   /**
-    * Deploy a durable queue.
-    * <br>
-    * This method will do nothing if the queue with the given name already 
exists on the server.
-    *
-    * @param address address to bind the queue to
-    * @param name    name of the queue
-    * @param filter  of the queue
-    */
-   @Operation(desc = "Deploy a queue", impact = MBeanOperationInfo.ACTION)
-   void deployQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
-                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
-                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter) throws Exception;
-
-   /**
-    * Deploy a queue.
-    * <br>
-    * This method will do nothing if the queue with the given name already 
exists on the server.
-    *
-    * @param address address to bind the queue to
-    * @param name    name of the queue
-    * @param filter  of the queue
-    * @param durable whether the queue is durable
-    */
-   @Operation(desc = "Deploy a queue", impact = MBeanOperationInfo.ACTION)
-   void deployQueue(@Parameter(name = "address", desc = "Address of the 
queue") String address,
-                    @Parameter(name = "name", desc = "Name of the queue") 
String name,
-                    @Parameter(name = "filter", desc = "Filter of the queue") 
String filter,
-                    @Parameter(name = "durable", desc = "Is the queue 
durable?") boolean durable) throws Exception;
-
-   /**
-    * Destroys the queue corresponding to the specified name.
-    */
-   @Operation(desc = "Destroy a queue", impact = MBeanOperationInfo.ACTION)
-   void destroyQueue(@Parameter(name = "name", desc = "Name of the queue to 
destroy") String name) throws Exception;
-
-   /**
-    * Enables message counters for this server.
-    */
-   @Operation(desc = "Enable message counters", impact = 
MBeanOperationInfo.ACTION)
-   void enableMessageCounters() throws Exception;
-
-   /**
-    * Disables message counters for this server.
-    */
-   @Operation(desc = "Disable message counters", impact = 
MBeanOperationInfo.ACTION)
-   void disableMessageCounters() throws Exception;
-
-   /**
-    * Reset all message counters.
-    */
-   @Operation(desc = "Reset all message counters", impact = 
MBeanOperationInfo.ACTION)
-   void resetAllMessageCounters() throws Exception;
-
-   /**
-    * Reset histories for all message counters.
-    */
-   @Operation(desc = "Reset all message counters history", impact = 
MBeanOperationInfo.ACTION)
-   void resetAllMessageCounterHistories() throws Exception;
-
-   /**
-    * List all the prepared transaction, sorted by date, oldest first.
-    * <br>
-    * The Strings are Base-64 representation of the transaction XID and can be
-    * used to heuristically commit or rollback the transactions.
-    *
-    * @see #commitPreparedTransaction(String)
-    * @see #rollbackPreparedTransaction(String)
-    */
-   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first")
-   String[] listPreparedTransactions() throws Exception;
-
-   /**
-    * List all the prepared transaction, sorted by date,
-    * oldest first, with details, in text format.
-    */
-   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first, with details, in JSON format")
-   String listPreparedTransactionDetailsAsJSON() throws Exception;
-
-   /**
-    * List all the prepared transaction, sorted by date,
-    * oldest first, with details, in HTML format
-    */
-   @Operation(desc = "List all the prepared transaction, sorted by date, 
oldest first, with details, in HTML format")
-   String listPreparedTransactionDetailsAsHTML() throws Exception;
-
-   /**
-    * List transactions which have been heuristically committed.
-    */
-   String[] listHeuristicCommittedTransactions() throws Exception;
-
-   /**
-    * List transactions which have been heuristically rolled back.
-    */
-   String[] listHeuristicRolledBackTransactions() throws Exception;
-
-   /**
-    * Heuristically commits a prepared transaction.
-    *
-    * @param transactionAsBase64 base 64 representation of a prepare 
transaction
-    * @return {@code true} if the transaction was successfully committed, 
{@code false} else
-    * @see #listPreparedTransactions()
-    */
-   @Operation(desc = "Commit a prepared transaction")
-   boolean commitPreparedTransaction(@Parameter(desc = "the Base64 
representation of a transaction", name = "transactionAsBase64") String 
transactionAsBase64) throws Exception;
-
-   /**
-    * Heuristically rolls back a prepared transaction.
-    *
-    * @param transactionAsBase64 base 64 representation of a prepare 
transaction
-    * @return {@code true} if the transaction was successfully rolled back, 
{@code false} else
-    * @see #listPreparedTransactions()
-    */
-   @Operation(desc = "Rollback a prepared transaction")
-   boolean rollbackPreparedTransaction(@Parameter(desc = "the Base64 
representation of a transaction", name = "transactionAsBase64") String 
transactionAsBase64) throws Exception;
-
-   /**
-    * Lists the addresses of all the clients connected to this address.
-    */
-   @Operation(desc = "List the client addresses", impact = 
MBeanOperationInfo.INFO)
-   String[] listRemoteAddresses() throws Exception;
-
-   /**
-    * Lists the addresses of the clients connected to this address which 
matches the specified IP address.
-    */
-   @Operation(desc = "List the client addresses which match the given IP 
Address", impact = MBeanOperationInfo.INFO)
-   String[] listRemoteAddresses(@Parameter(desc = "an IP address", name = 
"ipAddress") String ipAddress) throws Exception;
-
-   /**
-    * Closes all the connections of clients connected to this server which 
matches the specified IP address.
-    */
-   @Operation(desc = "Closes all the connections for the given IP Address", 
impact = MBeanOperationInfo.INFO)
-   boolean closeConnectionsForAddress(@Parameter(desc = "an IP address", name 
= "ipAddress") String ipAddress) throws Exception;
-
-   /**
-    * Closes all the connections of clients connected to this server which 
matches the specified IP address.
-    */
-   @Operation(desc = "Closes all the consumer connections for the given 
HornetQ address", impact = MBeanOperationInfo.INFO)
-   boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a HornetQ 
address", name = "address") String address) throws Exception;
-
-   /**
-    * Closes all the connections of sessions with a matching user name.
-    */
-   @Operation(desc = "Closes all the connections for sessions with the given 
user name", impact = MBeanOperationInfo.INFO)
-   boolean closeConnectionsForUser(@Parameter(desc = "a user name", name = 
"userName") String address) throws Exception;
-
-   /**
-    * Lists all the IDs of the connections connected to this server.
-    */
-   @Operation(desc = "List all the connection IDs", impact = 
MBeanOperationInfo.INFO)
-   String[] listConnectionIDs() throws Exception;
-
-   String listProducersInfoAsJSON() throws Exception;
-
-   /**
-    * Lists all the sessions IDs for the specified connection ID.
-    */
-   @Operation(desc = "List the sessions for the given connectionID", impact = 
MBeanOperationInfo.INFO)
-   String[] listSessions(@Parameter(desc = "a connection ID", name = 
"connectionID") String connectionID) throws Exception;
-
-   /**
-    * This method is used by HornetQ clustering and must not be called by 
HornetQ clients.
-    */
-   void sendQueueInfoToQueue(String queueName, String address) throws 
Exception;
-
-   @Operation(desc = "Add security settings for addresses matching the 
addressMatch", impact = MBeanOperationInfo.ACTION)
-   void addSecuritySettings(
-      @Parameter(desc = "an address match", name = "addressMatch") String 
addressMatch,
-      @Parameter(desc = "a comma-separated list of roles allowed to send 
messages", name = "send") String sendRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to consume 
messages", name = "consume") String consumeRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to create 
durable queues", name = "createDurableQueueRoles") String 
createDurableQueueRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to delete 
durable queues", name = "deleteDurableQueueRoles") String 
deleteDurableQueueRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to create non 
durable queues", name = "createNonDurableQueueRoles") String 
createNonDurableQueueRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to delete non 
durable queues", name = "deleteNonDurableQueueRoles") String 
deleteNonDurableQueueRoles,
-      @Parameter(desc = "a comma-separated list of roles allowed to send 
management messages messages", name = "manage") String manageRoles) throws 
Exception;
-
-   @Operation(desc = "Remove security settings for an address", impact = 
MBeanOperationInfo.ACTION)
-   void removeSecuritySettings(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
-
-   @Operation(desc = "get roles for a specific address match", impact = 
MBeanOperationInfo.INFO)
-   Object[] getRoles(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
-
-   @Operation(desc = "get roles (as a JSON string) for a specific address 
match", impact = MBeanOperationInfo.INFO)
-   String getRolesAsJSON(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch) throws Exception;
-
-   /**
-    * adds a new address setting for a specific address
-    */
-   @Operation(desc = "Add address settings for addresses matching the 
addressMatch", impact = MBeanOperationInfo.ACTION)
-   void addAddressSettings(@Parameter(desc = "an address match", name = 
"addressMatch") String addressMatch,
-                           @Parameter(desc = "the dead letter address 
setting", name = "DLA") String DLA,
-                           @Parameter(desc = "the expiry address setting", 
name = "expiryAddress") String expiryAddress,
-                           @Parameter(desc = "the expiry delay setting", name 
= "expiryDelay") long expiryDelay,
-                           @Parameter(desc = "are any queues created for this 
address a last value queue", name = "lastValueQueue") boolean lastValueQueue,
-                           @Parameter(desc = "the delivery attempts", name = 
"deliveryAttempts") int deliveryAttempts,
-                           @Parameter(desc = "the max size in bytes", name = 
"maxSizeBytes") long maxSizeBytes,
-                           @Parameter(desc = "the page size in bytes", name = 
"pageSizeBytes") int pageSizeBytes,
-                           @Parameter(desc = "the max number of pages in the 
soft memory cache", name = "pageMaxCacheSize") int pageMaxCacheSize,
-                           @Parameter(desc = "the redelivery delay", name = 
"redeliveryDelay") long redeliveryDelay,
-                           @Parameter(desc = "the redelivery delay 
multiplier", name = "redeliveryMultiplier") double redeliveryMultiplier,
-                           @Parameter(desc = "the maximum redelivery delay", 
name = "maxRedeliveryDelay") long maxRedeliveryDelay,
-                           @Parameter(desc = "the redistribution delay", name 
= "redistributionDelay") long redistributionDelay,
-                           @Parameter(desc = "do we send to the DLA when there 
is no where to route the message", name = "sendToDLAOnNoRoute") boolean 
sendToDLAOnNoRoute,
-                           @Parameter(desc = "the policy to use when the 
address is full", name = "addressFullMessagePolicy") String 
addressFullMessagePolicy,
-                           @Parameter(desc = "when a consumer falls below this 
threshold in terms of messages consumed per second it will be considered 
'slow'", name = "slowConsumerThreshold") long slowConsumerThreshold,
-                           @Parameter(desc = "how often (in seconds) to check 
for slow consumers", name = "slowConsumerCheckPeriod") long 
slowConsumerCheckPeriod,
-                           @Parameter(desc = "the policy to use when a slow 
consumer is detected", name = "slowConsumerPolicy") String slowConsumerPolicy) 
throws Exception;
-
-   void removeAddressSettings(String addressMatch) throws Exception;
-
-   /**
-    * returns the address settings as a JSON string
-    */
-   @Operation(desc = "returns the address settings as a JSON string for an 
address match", impact = MBeanOperationInfo.INFO)
-   String getAddressSettingsAsJSON(@Parameter(desc = "an address match", name 
= "addressMatch") String addressMatch) throws Exception;
-
-   String[] getDivertNames();
-
-   @Operation(desc = "Create a Divert", impact = MBeanOperationInfo.ACTION)
-   void createDivert(@Parameter(name = "name", desc = "Name of the divert") 
String name,
-                     @Parameter(name = "routingName", desc = "Routing name of 
the divert") String routingName,
-                     @Parameter(name = "address", desc = "Address to divert 
from") String address,
-                     @Parameter(name = "forwardingAddress", desc = "Address to 
divert to") String forwardingAddress,
-                     @Parameter(name = "exclusive", desc = "Is the divert 
exclusive?") boolean exclusive,
-                     @Parameter(name = "filterString", desc = "Filter of the 
divert") String filterString,
-                     @Parameter(name = "transformerClassName", desc = "Class 
name of the divert's transformer") String transformerClassName) throws 
Exception;
-
-   @Operation(desc = "Destroy a Divert", impact = MBeanOperationInfo.ACTION)
-   void destroyDivert(@Parameter(name = "name", desc = "Name of the divert") 
String name) throws Exception;
-
-   String[] getBridgeNames();
-
-   @Operation(desc = "Create a Bridge", impact = MBeanOperationInfo.ACTION)
-   void createBridge(@Parameter(name = "name", desc = "Name of the bridge") 
String name,
-                     @Parameter(name = "queueName", desc = "Name of the source 
queue") String queueName,
-                     @Parameter(name = "forwardingAddress", desc = "Forwarding 
address") String forwardingAddress,
-                     @Parameter(name = "filterString", desc = "Filter of the 
brdige") String filterString,
-                     @Parameter(name = "transformerClassName", desc = "Class 
name of the bridge transformer") String transformerClassName,
-                     @Parameter(name = "retryInterval", desc = "Connection 
retry interval") long retryInterval,
-                     @Parameter(name = "retryIntervalMultiplier", desc = 
"Connection retry interval multiplier") double retryIntervalMultiplier,
-                     @Parameter(name = "initialConnectAttempts", desc = 
"Number of initial connection attempts") int initialConnectAttempts,
-                     @Parameter(name = "reconnectAttempts", desc = "Number of 
reconnection attempts") int reconnectAttempts,
-                     @Parameter(name = "useDuplicateDetection", desc = "Use 
duplicate detection") boolean useDuplicateDetection,
-                     @Parameter(name = "confirmationWindowSize", desc = 
"Confirmation window size") int confirmationWindowSize,
-                     @Parameter(name = "clientFailureCheckPeriod", desc = 
"Period to check client failure") long clientFailureCheckPeriod,
-                     @Parameter(name = "staticConnectorNames", desc = "comma 
separated list of connector names or name of discovery group if 
'useDiscoveryGroup' is set to true") String connectorNames,
-                     @Parameter(name = "useDiscoveryGroup", desc = "use 
discovery  group") boolean useDiscoveryGroup,
-                     @Parameter(name = "ha", desc = "Is it using HA") boolean 
ha,
-                     @Parameter(name = "user", desc = "User name") String user,
-                     @Parameter(name = "password", desc = "User password") 
String password) throws Exception;
-
-
-   @Operation(desc = "Destroy a bridge", impact = MBeanOperationInfo.ACTION)
-   void destroyBridge(@Parameter(name = "name", desc = "Name of the bridge") 
String name) throws Exception;
-
-   @Operation(desc = "force the server to stop and notify clients to 
failover", impact = MBeanOperationInfo.UNKNOWN)
-   void forceFailover() throws Exception;
-
-   void updateDuplicateIdCache(String address, Object[] ids) throws Exception;
-
-   @Operation(desc = "force the server to stop and to scale down to another 
server", impact = MBeanOperationInfo.UNKNOWN)
-   void scaleDown(@Parameter(name = "name", desc = "The connector to use to 
scale down, if not provided the first appropriate connector will be 
used")String connector) throws Exception;
-}
-

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java
index cad6844..f8e0ad6 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ManagementHelper.java
@@ -19,12 +19,12 @@ import java.util.Map;
 
 import org.apache.activemq.api.core.Message;
 import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
 import org.apache.activemq.utils.json.JSONArray;
 import org.apache.activemq.utils.json.JSONObject;
 
 /**
- * Helper class to use HornetQ Core messages to manage server resources.
+ * Helper class to use ActiveMQ Core messages to manage server resources.
  *
  * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a>
  * @author <a href="mailto:tim....@jboss.com";>Tim Fox</a>
@@ -292,12 +292,12 @@ public final class ManagementHelper
          param instanceof Byte == false &&
          param instanceof Short == false)
       {
-         throw 
HornetQClientMessageBundle.BUNDLE.invalidManagementParam(param.getClass().getName());
+         throw 
ActiveMQClientMessageBundle.BUNDLE.invalidManagementParam(param.getClass().getName());
       }
    }
 
    /**
-    * Used by HornetQ management service.
+    * Used by ActiveMQ management service.
     */
    public static Object[] retrieveOperationParameters(final Message message) 
throws Exception
    {
@@ -333,7 +333,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by HornetQ management service.
+    * Used by ActiveMQ management service.
     */
    public static void storeResult(final Message message, final Object result) 
throws Exception
    {
@@ -417,7 +417,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by HornetQ management service.
+    * Used by ActiveMQ management service.
     */
    public static Map<String, Object> fromCommaSeparatedKeyValues(final String 
str) throws Exception
    {
@@ -433,7 +433,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by HornetQ management service.
+    * Used by ActiveMQ management service.
     */
    public static Object[] 
fromCommaSeparatedArrayOfCommaSeparatedKeyValues(final String str) throws 
Exception
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java
index 0f94538..0548a1e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/NotificationType.java
@@ -13,15 +13,15 @@
 package org.apache.activemq.api.core.management;
 
 /**
- * Types of notification emitted by HornetQ servers.
+ * Types of notification emitted by ActiveMQ servers.
  * <p>
  * These notifications can be received through:
  * <ul>
  * <li>JMX' MBeans subscriptions
- * <li>Core messages to a notification address (default value is {@code 
hornetq.notifications})
+ * <li>Core messages to a notification address (default value is {@code 
activemq.notifications})
  * <li>JMS messages
  * </ul>
- * @see the HornetQ user manual section on "Management Notifications"
+ * @see the ActiveMQ user manual section on "Management Notifications"
  * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a>
  */
 public interface NotificationType

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
index 0f53d16..38811de 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
@@ -18,7 +18,7 @@ import 
org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 
 /**
- * Helper class to build ObjectNames for HornetQ resources.
+ * Helper class to build ObjectNames for ActiveMQ resources.
  * @author <a href="jmes...@redhat.com">Jeff Mesnil</a>
  */
 public final class ObjectNameBuilder
@@ -27,7 +27,7 @@ public final class ObjectNameBuilder
    // Constants -----------------------------------------------------
 
    /**
-    * Default JMX domain for HornetQ resources.
+    * Default JMX domain for ActiveMQ resources.
     */
    public static final ObjectNameBuilder DEFAULT = new 
ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
 
@@ -63,9 +63,9 @@ public final class ObjectNameBuilder
    // Public --------------------------------------------------------
 
    /**
-    * Returns the ObjectName used by the single {@link HornetQServerControl}.
+    * Returns the ObjectName used by the single {@link ActiveMQServerControl}.
     */
-   public ObjectName getHornetQServerObjectName() throws Exception
+   public ObjectName getActiveMQServerObjectName() throws Exception
    {
       return ObjectName.getInstance(domain + ":module=Core,type=Server");
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
index 97fc8ab..8ea922e 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/package-info.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 /**
- * Management API for HornetQ servers and its Core resources.
+ * Management API for ActiveMQ servers and its Core resources.
  * <br>
- * HornetQ can be managed either using JMX or by sending management messages 
to the
+ * ActiveMQ can be managed either using JMX or by sending management messages 
to the
  * server's special management address. Please refer to the user manual for 
more information.
  */
 package org.apache.activemq.api.core.management;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
----------------------------------------------------------------------
diff --git 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
index d56fc3c..8fecb75 100644
--- 
a/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
+++ 
b/activemq-core-client/src/main/java/org/apache/activemq/api/core/package-info.java
@@ -14,7 +14,7 @@
  * Core Messaging API.
  * <br>
  * This package defines base classes and interfaces used
- * throughout HornetQ API
+ * throughout ActiveMQ API
  */
 package org.apache.activemq.api.core;
 

Reply via email to