Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-132 260e1a25f -> 583e7024a


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
index a59d300..6918542 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpiMBean.java
@@ -26,7 +26,7 @@ import java.util.*;
 /**
  * Management MBean for job stealing based collision SPI.
  */
-@IgniteMBeanDescription("MBean for job stealing based collision SPI.")
+@IgniteMXBeanDescription("MBean for job stealing based collision SPI.")
 public interface JobStealingCollisionSpiMBean extends IgniteSpiManagementMBean 
{
     /**
      * Gets current number of jobs to be stolen. This is outstanding
@@ -34,7 +34,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of jobs to be stolen.
      */
-    @IgniteMBeanDescription("Number of jobs to be stolen.")
+    @IgniteMXBeanDescription("Number of jobs to be stolen.")
     public int getCurrentJobsToStealNumber();
 
     /**
@@ -42,7 +42,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of jobs that wait for execution.
      */
-    @IgniteMBeanDescription("Number of jobs that wait for execution.")
+    @IgniteMXBeanDescription("Number of jobs that wait for execution.")
     public int getCurrentWaitJobsNumber();
 
     /**
@@ -50,7 +50,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of active jobs.
      */
-    @IgniteMBeanDescription("Number of active jobs.")
+    @IgniteMXBeanDescription("Number of active jobs.")
     public int getCurrentActiveJobsNumber();
 
     /*
@@ -58,7 +58,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of currently running (not {@code 'held}) jobs.
      */
-    @IgniteMBeanDescription("Number of running jobs.")
+    @IgniteMXBeanDescription("Number of running jobs.")
     public int getCurrentRunningJobsNumber();
 
     /**
@@ -66,7 +66,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of currently {@code 'held'} jobs.
      */
-    @IgniteMBeanDescription("Number of held jobs.")
+    @IgniteMXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
 
     /**
@@ -74,7 +74,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of stolen jobs.
      */
-    @IgniteMBeanDescription("Number of stolen jobs.")
+    @IgniteMXBeanDescription("Number of stolen jobs.")
     public int getTotalStolenJobsNumber();
 
     /**
@@ -82,7 +82,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of jobs that can be executed in parallel.
      */
-    @IgniteMBeanDescription("Number of jobs that can be executed in parallel.")
+    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
     public int getActiveJobsThreshold();
 
     /**
@@ -90,7 +90,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param activeJobsTreshold Number of jobs that can be executed in 
parallel.
      */
-    @IgniteMBeanDescription("Number of jobs that can be executed in parallel.")
+    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
     public void setActiveJobsThreshold(int activeJobsTreshold);
 
     /**
@@ -99,7 +99,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Job count threshold.
      */
-    @IgniteMBeanDescription("Job count threshold.")
+    @IgniteMXBeanDescription("Job count threshold.")
     public int getWaitJobsThreshold();
 
     /**
@@ -108,7 +108,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param waitJobsThreshold Job count threshold.
      */
-    @IgniteMBeanDescription("Job count threshold.")
+    @IgniteMXBeanDescription("Job count threshold.")
     public void setWaitJobsThreshold(int waitJobsThreshold);
 
     /**
@@ -119,7 +119,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message expire time.
      */
-    @IgniteMBeanDescription("Message expire time.")
+    @IgniteMXBeanDescription("Message expire time.")
     public long getMessageExpireTime();
 
     /**
@@ -130,7 +130,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param msgExpireTime Message expire time.
      */
-    @IgniteMBeanDescription("Message expire time.")
+    @IgniteMXBeanDescription("Message expire time.")
     public void setMessageExpireTime(long msgExpireTime);
 
     /**
@@ -144,7 +144,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      * @return Flag indicating whether this node should attempt to steal jobs
      *      from other nodes.
      */
-    @IgniteMBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
+    @IgniteMXBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
     public boolean isStealingEnabled();
 
     /**
@@ -158,7 +158,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      * @param stealingEnabled Flag indicating whether this node should attempt 
to steal jobs
      *      from other nodes.
      */
-    @IgniteMBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
+    @IgniteMXBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
     public void setStealingEnabled(boolean stealingEnabled);
 
     /**
@@ -168,7 +168,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum number of attempts to steal job by another node.
      */
-    @IgniteMBeanDescription("Maximum number of attempts to steal job by 
another node.")
+    @IgniteMXBeanDescription("Maximum number of attempts to steal job by 
another node.")
     public int getMaximumStealingAttempts();
 
     /**
@@ -178,7 +178,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param maximumStealingAttempts Maximum number of attempts to steal job 
by another node.
      */
-    @IgniteMBeanDescription("Maximum number of attempts to steal job by 
another node.")
+    @IgniteMXBeanDescription("Maximum number of attempts to steal job by 
another node.")
     public void setMaximumStealingAttempts(int maximumStealingAttempts);
 
     /**
@@ -188,6 +188,6 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Node attributes to enable job stealing for.
      */
-    @IgniteMBeanDescription("Node attributes to enable job stealing for.")
+    @IgniteMXBeanDescription("Node attributes to enable job stealing for.")
     public Map<String, ? extends Serializable> getStealingAttributes();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
index fa7b0d8..d16dc8f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMBean.java
@@ -23,14 +23,14 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean that provides access to the priority queue collision SPI 
configuration.
  */
-@IgniteMBeanDescription("MBean provides access to the priority queue collision 
SPI.")
+@IgniteMXBeanDescription("MBean provides access to the priority queue 
collision SPI.")
 public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
     /**
      * Gets current number of jobs that wait for the execution.
      *
      * @return Number of jobs that wait for execution.
      */
-    @IgniteMBeanDescription("Number of jobs that wait for execution.")
+    @IgniteMXBeanDescription("Number of jobs that wait for execution.")
     public int getCurrentWaitJobsNumber();
 
     /**
@@ -38,7 +38,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of active jobs.
      */
-    @IgniteMBeanDescription("Number of active jobs.")
+    @IgniteMXBeanDescription("Number of active jobs.")
     public int getCurrentActiveJobsNumber();
 
     /*
@@ -46,7 +46,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of currently running (not {@code 'held}) jobs.
      */
-    @IgniteMBeanDescription("Number of running jobs.")
+    @IgniteMXBeanDescription("Number of running jobs.")
     public int getCurrentRunningJobsNumber();
 
     /**
@@ -54,7 +54,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of currently {@code 'held'} jobs.
      */
-    @IgniteMBeanDescription("Number of held jobs.")
+    @IgniteMXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
 
     /**
@@ -62,7 +62,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of jobs that can be executed in parallel.
      */
-    @IgniteMBeanDescription("Number of jobs that can be executed in parallel.")
+    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
     public int getParallelJobsNumber();
 
     /**
@@ -70,7 +70,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param num Parallel jobs number.
      */
-    @IgniteMBeanDescription("Number of jobs that can be executed in parallel.")
+    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
     public void setParallelJobsNumber(int num);
 
     /**
@@ -79,7 +79,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Maximum allowed number of waiting jobs.
      */
-    @IgniteMBeanDescription("Maximum allowed number of waiting jobs.")
+    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
     public int getWaitingJobsNumber();
 
     /**
@@ -88,7 +88,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param num Maximium jobs number.
      */
-    @IgniteMBeanDescription("Maximum allowed number of waiting jobs.")
+    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
     public void setWaitingJobsNumber(int num);
 
     /**
@@ -96,7 +96,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Key name of task priority attribute.
      */
-    @IgniteMBeanDescription("Key name of task priority attribute.")
+    @IgniteMXBeanDescription("Key name of task priority attribute.")
     public String getPriorityAttributeKey();
 
     /**
@@ -104,7 +104,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Key name of job priority attribute.
      */
-    @IgniteMBeanDescription("Key name of job priority attribute.")
+    @IgniteMXBeanDescription("Key name of job priority attribute.")
     public String getJobPriorityAttributeKey();
 
     /**
@@ -114,7 +114,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      * @return Default priority to use if a task does not have priority
      *      attribute set.
      */
-    @IgniteMBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
+    @IgniteMXBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
     public int getDefaultPriority();
 
     /**
@@ -122,7 +122,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param priority default priority.
      */
-    @IgniteMBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
+    @IgniteMXBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
     public void setDefaultPriority(int priority);
 
     /**
@@ -132,7 +132,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      * @return Value to increment job priority by every time a lower priority 
job gets
      *      behind a higher priority job.
      */
-    @IgniteMBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
+    @IgniteMXBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
     public int getStarvationIncrement();
 
     /**
@@ -141,7 +141,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param increment Increment value.
      */
-    @IgniteMBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
+    @IgniteMXBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
     public void setStarvationIncrement(int increment);
 
     /**
@@ -149,7 +149,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Flag indicating whether job starvation prevention is enabled.
      */
-    @IgniteMBeanDescription("Flag indicating whether job starvation prevention 
is enabled.")
+    @IgniteMXBeanDescription("Flag indicating whether job starvation 
prevention is enabled.")
     public boolean isStarvationPreventionEnabled();
 
     /**
@@ -157,6 +157,6 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param preventStarvation Flag indicating whether job starvation 
prevention is enabled.
      */
-    @IgniteMBeanDescription("Flag indicating whether job starvation prevention 
is enabled.")
+    @IgniteMXBeanDescription("Flag indicating whether job starvation 
prevention is enabled.")
     public void setStarvationPreventionEnabled(boolean preventStarvation);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
index 98a47b1..d7af479 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * MBean provide access to TCP-based communication SPI.
  */
-@IgniteMBeanDescription("MBean provide access to TCP-based communication SPI.")
+@IgniteMXBeanDescription("MBean provide access to TCP-based communication 
SPI.")
 public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets local host address for socket binding.
@@ -32,7 +32,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Grid node IP address.
      */
-    @IgniteMBeanDescription("Grid node IP address.")
+    @IgniteMXBeanDescription("Grid node IP address.")
     public String getLocalAddress();
 
     /**
@@ -40,7 +40,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Port number.
      */
-    @IgniteMBeanDescription("Port number.")
+    @IgniteMXBeanDescription("Port number.")
     public int getLocalPort();
 
     /**
@@ -48,7 +48,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Port number.
      */
-    @IgniteMBeanDescription("Shared memory endpoint port number.")
+    @IgniteMXBeanDescription("Shared memory endpoint port number.")
     public int getSharedMemoryPort();
 
     /**
@@ -57,7 +57,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Local port range.
      */
-    @IgniteMBeanDescription("Local port range.")
+    @IgniteMXBeanDescription("Local port range.")
     public int getLocalPortRange();
 
     /**
@@ -66,7 +66,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum idle connection time.
      */
-    @IgniteMBeanDescription("Maximum idle connection time.")
+    @IgniteMXBeanDescription("Maximum idle connection time.")
     public long getIdleConnectionTimeout();
 
     /**
@@ -74,7 +74,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Flag that indicates whether direct or heap allocated buffer is 
used.
      */
-    @IgniteMBeanDescription("Flag that indicates whether direct or heap 
allocated buffer is used.")
+    @IgniteMXBeanDescription("Flag that indicates whether direct or heap 
allocated buffer is used.")
     public boolean isDirectBuffer();
 
     /**
@@ -83,7 +83,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Count of selectors in TCP server.
      */
-    @IgniteMBeanDescription("Count of selectors used in TCP server.")
+    @IgniteMXBeanDescription("Count of selectors used in TCP server.")
     public int getSelectorsCount();
 
     /**
@@ -91,7 +91,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Sent messages count.
      */
-    @IgniteMBeanDescription("Sent messages count.")
+    @IgniteMXBeanDescription("Sent messages count.")
     public int getSentMessagesCount();
 
     /**
@@ -99,7 +99,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Sent bytes count.
      */
-    @IgniteMBeanDescription("Sent bytes count.")
+    @IgniteMXBeanDescription("Sent bytes count.")
     public long getSentBytesCount();
 
     /**
@@ -107,7 +107,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Received messages count.
      */
-    @IgniteMBeanDescription("Received messages count.")
+    @IgniteMXBeanDescription("Received messages count.")
     public int getReceivedMessagesCount();
 
     /**
@@ -115,7 +115,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Received bytes count.
      */
-    @IgniteMBeanDescription("Received bytes count.")
+    @IgniteMXBeanDescription("Received bytes count.")
     public long getReceivedBytesCount();
 
     /**
@@ -123,7 +123,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Outbound messages queue size.
      */
-    @IgniteMBeanDescription("Outbound messages queue size.")
+    @IgniteMXBeanDescription("Outbound messages queue size.")
     public int getOutboundMessagesQueueSize();
 
     /**
@@ -132,7 +132,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Connect timeout.
      */
-    @IgniteMBeanDescription("Connect timeout.")
+    @IgniteMXBeanDescription("Connect timeout.")
     public long getConnectTimeout();
 
     /**
@@ -140,7 +140,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum connect timeout.
      */
-    @IgniteMBeanDescription("Maximum connect timeout.")
+    @IgniteMXBeanDescription("Maximum connect timeout.")
     public long getMaxConnectTimeout();
 
     /**
@@ -149,7 +149,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Reconnects count.
      */
-    @IgniteMBeanDescription("Reconnect count on connection failure.")
+    @IgniteMXBeanDescription("Reconnect count on connection failure.")
     public int getReconnectCount();
 
     /**
@@ -157,7 +157,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return {@code True} if TCP delay is disabled.
      */
-    @IgniteMBeanDescription("TCP_NODELAY socket option value.")
+    @IgniteMXBeanDescription("TCP_NODELAY socket option value.")
     public boolean isTcpNoDelay();
 
     /**
@@ -169,7 +169,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Flush frequency.
      */
-    @IgniteMBeanDescription("Connection buffer flush frequency.")
+    @IgniteMXBeanDescription("Connection buffer flush frequency.")
     public long getConnectionBufferFlushFrequency();
 
     /**
@@ -186,7 +186,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      * @param connBufFlushFreq Flush frequency.
      * @see #getConnectionBufferSize()
      */
-    @IgniteMBeanDescription("Sets connection buffer flush frequency.")
+    @IgniteMXBeanDescription("Sets connection buffer flush frequency.")
     public void setConnectionBufferFlushFrequency(long connBufFlushFreq);
 
     /**
@@ -196,7 +196,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Connection buffer size.
      */
-    @IgniteMBeanDescription("Connection buffer size.")
+    @IgniteMXBeanDescription("Connection buffer size.")
     public int getConnectionBufferSize();
 
     /**
@@ -204,7 +204,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return {@code True} if direct buffers should be used.
      */
-    @IgniteMBeanDescription("Direct send buffer.")
+    @IgniteMXBeanDescription("Direct send buffer.")
     public boolean isDirectSendBuffer();
 
     /**
@@ -214,7 +214,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket receive buffer size.
      */
-    @IgniteMBeanDescription("Socket receive buffer.")
+    @IgniteMXBeanDescription("Socket receive buffer.")
     public int getSocketReceiveBuffer();
 
     /**
@@ -224,7 +224,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket send buffer size.
      */
-    @IgniteMBeanDescription("Socket send buffer.")
+    @IgniteMXBeanDescription("Socket send buffer.")
     public int getSocketSendBuffer();
 
     /**
@@ -232,7 +232,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Send queue size limit.
      */
-    @IgniteMBeanDescription("Message queue size limit.")
+    @IgniteMXBeanDescription("Message queue size limit.")
     public int getMessageQueueLimit();
 
     /**
@@ -241,7 +241,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Minimum buffered message count.
      */
-    @IgniteMBeanDescription("Minimum buffered message count.")
+    @IgniteMXBeanDescription("Minimum buffered message count.")
     public int getMinimumBufferedMessageCount();
 
     /**
@@ -250,7 +250,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Buffer size ratio.
      */
-    @IgniteMBeanDescription("Buffer size ratio.")
+    @IgniteMXBeanDescription("Buffer size ratio.")
     public double getBufferSizeRatio();
 
     /**
@@ -259,7 +259,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket write timeout for TCP connections.
      */
-    @IgniteMBeanDescription("Socket write timeout.")
+    @IgniteMXBeanDescription("Socket write timeout.")
     public long getSocketWriteTimeout();
 
     /**
@@ -267,7 +267,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of received messages after which acknowledgment is sent.
      */
-    @IgniteMBeanDescription("Number of received messages after which 
acknowledgment is sent.")
+    @IgniteMXBeanDescription("Number of received messages after which 
acknowledgment is sent.")
     public int getAckSendThreshold();
 
     /**
@@ -277,6 +277,6 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum number of unacknowledged messages.
      */
-    @IgniteMBeanDescription("Maximum number of unacknowledged messages.")
+    @IgniteMXBeanDescription("Maximum number of unacknowledged messages.")
     public int getUnacknowledgedMessagesBufferSize();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
index 9290b22..faf00e3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management MBean for {@link LocalDeploymentSpi} SPI.
  */
-@IgniteMBeanDescription("MBean that provides access to local deployment SPI 
configuration.")
+@IgniteMXBeanDescription("MBean that provides access to local deployment SPI 
configuration.")
 public interface LocalDeploymentSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
index 3067472..f9c00d9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMBean.java
@@ -31,7 +31,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Disconnect check interval.
      */
-    @IgniteMBeanDescription("Disconnect check interval.")
+    @IgniteMXBeanDescription("Disconnect check interval.")
     public long getDisconnectCheckInterval();
 
     /**
@@ -39,7 +39,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket timeout.
      */
-    @IgniteMBeanDescription("Socket timeout.")
+    @IgniteMXBeanDescription("Socket timeout.")
     public long getSocketTimeout();
 
     /**
@@ -47,7 +47,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message acknowledgement timeout.
      */
-    @IgniteMBeanDescription("Message acknowledgement timeout.")
+    @IgniteMXBeanDescription("Message acknowledgement timeout.")
     public long getAckTimeout();
 
     /**
@@ -55,7 +55,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Network timeout.
      */
-    @IgniteMBeanDescription("Network timeout.")
+    @IgniteMXBeanDescription("Network timeout.")
     public long getNetworkTimeout();
 
     /**
@@ -63,7 +63,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Thread priority.
      */
-    @IgniteMBeanDescription("Threads priority.")
+    @IgniteMXBeanDescription("Threads priority.")
     public int getThreadPriority();
 
     /**
@@ -71,7 +71,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Time period in milliseconds.
      */
-    @IgniteMBeanDescription("Heartbeat frequency.")
+    @IgniteMXBeanDescription("Heartbeat frequency.")
     public long getHeartbeatFrequency();
 
     /**
@@ -79,7 +79,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return IPFinder (string representation).
      */
-    @IgniteMBeanDescription("IP Finder.")
+    @IgniteMXBeanDescription("IP Finder.")
     public String getIpFinderFormatted();
 
     /**
@@ -87,7 +87,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message worker queue current size.
      */
-    @IgniteMBeanDescription("Message worker queue current size.")
+    @IgniteMXBeanDescription("Message worker queue current size.")
     public int getMessageWorkerQueueSize();
 
     /**
@@ -95,7 +95,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Nodes joined count.
      */
-    @IgniteMBeanDescription("Nodes joined count.")
+    @IgniteMXBeanDescription("Nodes joined count.")
     public long getNodesJoined();
 
     /**
@@ -103,7 +103,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Left nodes count.
      */
-    @IgniteMBeanDescription("Nodes left count.")
+    @IgniteMXBeanDescription("Nodes left count.")
     public long getNodesLeft();
 
     /**
@@ -111,7 +111,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Failed nodes count.
      */
-    @IgniteMBeanDescription("Nodes failed count.")
+    @IgniteMXBeanDescription("Nodes failed count.")
     public long getNodesFailed();
 
     /**
@@ -119,7 +119,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Avg message processing time.
      */
-    @IgniteMBeanDescription("Avg message processing time.")
+    @IgniteMXBeanDescription("Avg message processing time.")
     public long getAvgMessageProcessingTime();
 
     /**
@@ -127,7 +127,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max message processing time.
      */
-    @IgniteMBeanDescription("Max message processing time.")
+    @IgniteMXBeanDescription("Max message processing time.")
     public long getMaxMessageProcessingTime();
 
     /**
@@ -135,7 +135,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total received messages count.
      */
-    @IgniteMBeanDescription("Total received messages count.")
+    @IgniteMXBeanDescription("Total received messages count.")
     public int getTotalReceivedMessages();
 
     /**
@@ -143,7 +143,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMBeanDescription("Received messages by type.")
+    @IgniteMXBeanDescription("Received messages by type.")
     public Map<String, Integer> getReceivedMessages();
 
     /**
@@ -151,7 +151,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total processed messages count.
      */
-    @IgniteMBeanDescription("Total processed messages count.")
+    @IgniteMXBeanDescription("Total processed messages count.")
     public int getTotalProcessedMessages();
 
     /**
@@ -159,6 +159,6 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMBeanDescription("Received messages by type.")
+    @IgniteMXBeanDescription("Received messages by type.")
     public Map<String, Integer> getProcessedMessages();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
index 4201c1d..7b2fa84 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
@@ -32,7 +32,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Time period in milliseconds.
      */
-    @IgniteMBeanDescription("Heartbeat frequency.")
+    @IgniteMXBeanDescription("Heartbeat frequency.")
     public long getHeartbeatFrequency();
 
     /**
@@ -40,7 +40,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Current SPI state.
      */
-    @IgniteMBeanDescription("SPI state.")
+    @IgniteMXBeanDescription("SPI state.")
     public String getSpiState();
 
     /**
@@ -48,7 +48,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return IPFinder (string representation).
      */
-    @IgniteMBeanDescription("IP Finder.")
+    @IgniteMXBeanDescription("IP Finder.")
     public String getIpFinderFormatted();
 
     /**
@@ -56,7 +56,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of connection attempts.
      */
-    @IgniteMBeanDescription("Reconnect count.")
+    @IgniteMXBeanDescription("Reconnect count.")
     public int getReconnectCount();
 
     /**
@@ -64,7 +64,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Network timeout.
      */
-    @IgniteMBeanDescription("Network timeout.")
+    @IgniteMXBeanDescription("Network timeout.")
     public long getNetworkTimeout();
 
     /**
@@ -72,7 +72,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Local port range.
      */
-    @IgniteMBeanDescription("Local TCP port.")
+    @IgniteMXBeanDescription("Local TCP port.")
     public int getLocalPort();
 
     /**
@@ -80,7 +80,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Local port range.
      */
-    @IgniteMBeanDescription("Local TCP port range.")
+    @IgniteMXBeanDescription("Local TCP port range.")
     public int getLocalPortRange();
 
     /**
@@ -88,7 +88,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max missed heartbeats.
      */
-    @IgniteMBeanDescription("Max missed heartbeats.")
+    @IgniteMXBeanDescription("Max missed heartbeats.")
     public int getMaxMissedHeartbeats();
 
     /**
@@ -96,7 +96,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max missed client heartbeats.
      */
-    @IgniteMBeanDescription("Max missed client heartbeats.")
+    @IgniteMXBeanDescription("Max missed client heartbeats.")
     public int getMaxMissedClientHeartbeats();
 
     /**
@@ -104,7 +104,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Thread priority.
      */
-    @IgniteMBeanDescription("Threads priority.")
+    @IgniteMXBeanDescription("Threads priority.")
     public int getThreadPriority();
 
     /**
@@ -112,7 +112,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return IP finder clean frequency.
      */
-    @IgniteMBeanDescription("IP finder clean frequency.")
+    @IgniteMXBeanDescription("IP finder clean frequency.")
     public long getIpFinderCleanFrequency();
 
     /**
@@ -120,7 +120,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Statistics print frequency in milliseconds.
      */
-    @IgniteMBeanDescription("Statistics print frequency.")
+    @IgniteMXBeanDescription("Statistics print frequency.")
     public long getStatisticsPrintFrequency();
 
     /**
@@ -128,7 +128,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message worker queue current size.
      */
-    @IgniteMBeanDescription("Message worker queue current size.")
+    @IgniteMXBeanDescription("Message worker queue current size.")
     public int getMessageWorkerQueueSize();
 
     /**
@@ -136,7 +136,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Nodes joined count.
      */
-    @IgniteMBeanDescription("Nodes joined count.")
+    @IgniteMXBeanDescription("Nodes joined count.")
     public long getNodesJoined();
 
     /**
@@ -144,7 +144,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Left nodes count.
      */
-    @IgniteMBeanDescription("Nodes left count.")
+    @IgniteMXBeanDescription("Nodes left count.")
     public long getNodesLeft();
 
     /**
@@ -152,7 +152,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Failed nodes count.
      */
-    @IgniteMBeanDescription("Nodes failed count.")
+    @IgniteMXBeanDescription("Nodes failed count.")
     public long getNodesFailed();
 
     /**
@@ -160,7 +160,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Pending messages registered count.
      */
-    @IgniteMBeanDescription("Pending messages registered.")
+    @IgniteMXBeanDescription("Pending messages registered.")
     public long getPendingMessagesRegistered();
 
     /**
@@ -168,7 +168,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Pending messages registered count.
      */
-    @IgniteMBeanDescription("Pending messages discarded.")
+    @IgniteMXBeanDescription("Pending messages discarded.")
     public long getPendingMessagesDiscarded();
 
     /**
@@ -176,7 +176,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Avg message processing time.
      */
-    @IgniteMBeanDescription("Avg message processing time.")
+    @IgniteMXBeanDescription("Avg message processing time.")
     public long getAvgMessageProcessingTime();
 
     /**
@@ -184,7 +184,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max message processing time.
      */
-    @IgniteMBeanDescription("Max message processing time.")
+    @IgniteMXBeanDescription("Max message processing time.")
     public long getMaxMessageProcessingTime();
 
     /**
@@ -192,7 +192,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total received messages count.
      */
-    @IgniteMBeanDescription("Total received messages count.")
+    @IgniteMXBeanDescription("Total received messages count.")
     public int getTotalReceivedMessages();
 
     /**
@@ -200,7 +200,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMBeanDescription("Received messages by type.")
+    @IgniteMXBeanDescription("Received messages by type.")
     public Map<String, Integer> getReceivedMessages();
 
     /**
@@ -208,7 +208,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total processed messages count.
      */
-    @IgniteMBeanDescription("Total processed messages count.")
+    @IgniteMXBeanDescription("Total processed messages count.")
     public int getTotalProcessedMessages();
 
     /**
@@ -216,7 +216,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMBeanDescription("Received messages by type.")
+    @IgniteMXBeanDescription("Received messages by type.")
     public Map<String, Integer> getProcessedMessages();
 
     /**
@@ -224,7 +224,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Time local node is coordinator since.
      */
-    @IgniteMBeanDescription("Local node is coordinator since.")
+    @IgniteMXBeanDescription("Local node is coordinator since.")
     public long getCoordinatorSinceTimestamp();
 
     /**
@@ -232,7 +232,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Gets current coordinator.
      */
-    @IgniteMBeanDescription("Coordinator node ID.")
+    @IgniteMXBeanDescription("Coordinator node ID.")
     @Nullable public UUID getCoordinator();
 
     /**
@@ -240,7 +240,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message acknowledgement timeout.
      */
-    @IgniteMBeanDescription("Message acknowledgement timeout.")
+    @IgniteMXBeanDescription("Message acknowledgement timeout.")
     public long getAckTimeout();
 
     /**
@@ -248,7 +248,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum message acknowledgement timeout.
      */
-    @IgniteMBeanDescription("Maximum message acknowledgement timeout.")
+    @IgniteMXBeanDescription("Maximum message acknowledgement timeout.")
     public long getMaxAckTimeout();
 
     /**
@@ -256,7 +256,7 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket timeout.
      */
-    @IgniteMBeanDescription("Socket timeout.")
+    @IgniteMXBeanDescription("Socket timeout.")
     public long getSocketTimeout();
 
     /**
@@ -264,12 +264,12 @@ public interface TcpDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Join timeout.
      */
-    @IgniteMBeanDescription("Join timeout.")
+    @IgniteMXBeanDescription("Join timeout.")
     public long getJoinTimeout();
 
     /**
      * Dumps debug info using configured logger.
      */
-    @IgniteMBeanDescription("Dump debug info.")
+    @IgniteMXBeanDescription("Dump debug info.")
     public void dumpDebugInfo();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
index e74a8ad..72e90e9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMBean.java
@@ -29,7 +29,7 @@ import org.apache.ignite.spi.*;
  * <li>Method that removes all items from queue (see {@link #clearAll()})</li>
  * </ul>
  */
-@IgniteMBeanDescription("MBean that provides access to memory event storage 
SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to memory event storage 
SPI configuration.")
 public interface MemoryEventStorageSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets event time-to-live value. Implementation must guarantee
@@ -37,7 +37,7 @@ public interface MemoryEventStorageSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Event time-to-live.
      */
-    @IgniteMBeanDescription("Event time-to-live value.")
+    @IgniteMXBeanDescription("Event time-to-live value.")
     public long getExpireAgeMs();
 
     /**
@@ -46,7 +46,7 @@ public interface MemoryEventStorageSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum event queue size.
      */
-    @IgniteMBeanDescription("Maximum event queue size.")
+    @IgniteMXBeanDescription("Maximum event queue size.")
     public long getExpireCount();
 
     /**
@@ -54,12 +54,12 @@ public interface MemoryEventStorageSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Current queue size of the event queue.
      */
-    @IgniteMBeanDescription("Current event queue size.")
+    @IgniteMXBeanDescription("Current event queue size.")
     public long getQueueSize();
 
     /**
      * Removes all events from the event queue.
      */
-    @IgniteMBeanDescription("Removes all events from the event queue.")
+    @IgniteMXBeanDescription("Removes all events from the event queue.")
     public void clearAll();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
index 30a121e..3190a90 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link AlwaysFailoverSpi}.
  */
-@IgniteMBeanDescription("MBean that provides access to always failover SPI 
configuration.")
+@IgniteMXBeanDescription("MBean that provides access to always failover SPI 
configuration.")
 public interface AlwaysFailoverSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets maximum number of attempts to execute a failed job on another node.
@@ -31,7 +31,7 @@ public interface AlwaysFailoverSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum number of attempts to execute a failed job on another 
node.
      */
-    @IgniteMBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
+    @IgniteMXBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
     public int getMaximumFailoverAttempts();
 
     /**
@@ -39,6 +39,6 @@ public interface AlwaysFailoverSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total number of failed over jobs.
      */
-    @IgniteMBeanDescription("Total number of jobs that were failed over.")
+    @IgniteMXBeanDescription("Total number of jobs that were failed over.")
     public int getTotalFailoverJobsCount();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
index 1b76945..426fffd 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link JobStealingFailoverSpi}.
  */
-@IgniteMBeanDescription("MBean that provides access to job stealing failover 
SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to job stealing failover 
SPI configuration.")
 public interface JobStealingFailoverSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets maximum number of attempts to execute a failed job on another node.
@@ -33,7 +33,7 @@ public interface JobStealingFailoverSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum number of attempts to execute a failed job on another 
node.
      */
-    @IgniteMBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
+    @IgniteMXBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
     public int getMaximumFailoverAttempts();
 
     /**
@@ -41,7 +41,7 @@ public interface JobStealingFailoverSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total number of failed over jobs.
      */
-    @IgniteMBeanDescription("Total number of jobs that were failed over 
including stolen ones.")
+    @IgniteMXBeanDescription("Total number of jobs that were failed over 
including stolen ones.")
     public int getTotalFailedOverJobsCount();
 
     /**
@@ -49,6 +49,6 @@ public interface JobStealingFailoverSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total number of stolen jobs.
      */
-    @IgniteMBeanDescription("Total number of jobs that were stolen.")
+    @IgniteMXBeanDescription("Total number of jobs that were stolen.")
     public int getTotalStolenJobsCount();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
index 3b59249..30e3028 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link NeverFailoverSpi}.
  */
-@IgniteMBeanDescription("MBean that provides access to never failover SPI 
configuration.")
+@IgniteMXBeanDescription("MBean that provides access to never failover SPI 
configuration.")
 public interface NeverFailoverSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
index 5e8cb08..e954ba4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMBean.java
@@ -23,13 +23,13 @@ import org.apache.ignite.spi.*;
 /**
  * Management MBean for {@link AdaptiveLoadBalancingSpi} SPI.
  */
-@IgniteMBeanDescription("MBean that provides access to adaptive load balancing 
SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to adaptive load 
balancing SPI configuration.")
 public interface AdaptiveLoadBalancingSpiMBean extends 
IgniteSpiManagementMBean {
     /**
      * Gets text description of current load probing implementation used.
      *
      * @return Text description of current load probing implementation used.
      */
-    @IgniteMBeanDescription("Text description of current load probing 
implementation used.")
+    @IgniteMXBeanDescription("Text description of current load probing 
implementation used.")
     public String getLoadProbeFormatted();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
index fffa07a..37e863f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link RoundRobinLoadBalancingSpi} SPI.
  */
-@IgniteMBeanDescription("MBean that provides access to round robin load 
balancing SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to round robin load 
balancing SPI configuration.")
 public interface RoundRobinLoadBalancingSpiMBean extends 
IgniteSpiManagementMBean {
     /**
      * Configuration parameter indicating whether a new round robin order 
should be
@@ -40,6 +40,6 @@ public interface RoundRobinLoadBalancingSpiMBean extends 
IgniteSpiManagementMBea
      * @return Configuration parameter indicating whether a new round robin 
order should
      *      be created for every task. Default is {@code true}.
      */
-    @IgniteMBeanDescription("Configuration parameter indicating whether a new 
round robin order should be created for every task.")
+    @IgniteMXBeanDescription("Configuration parameter indicating whether a new 
round robin order should be created for every task.")
     public boolean isPerTask();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
index 64485d0..5a65466 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management MBean for {@link WeightedRandomLoadBalancingSpi} SPI.
  */
-@IgniteMBeanDescription("MBean that provides access to weighted random load 
balancing SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to weighted random load 
balancing SPI configuration.")
 public interface WeightedRandomLoadBalancingSpiMBean extends 
IgniteSpiManagementMBean {
     /**
      * Checks whether node weights are considered when doing
@@ -32,7 +32,7 @@ public interface WeightedRandomLoadBalancingSpiMBean extends 
IgniteSpiManagement
      * @return If {@code true} then random load is distributed according
      *      to node weights.
      */
-    @IgniteMBeanDescription("Whether node weights are considered when doing 
random load balancing.")
+    @IgniteMXBeanDescription("Whether node weights are considered when doing 
random load balancing.")
     public boolean isUseWeights();
 
     /**
@@ -40,6 +40,6 @@ public interface WeightedRandomLoadBalancingSpiMBean extends 
IgniteSpiManagement
      *
      * @return Weight of this node.
      */
-    @IgniteMBeanDescription("Weight of this node.")
+    @IgniteMXBeanDescription("Weight of this node.")
     public int getNodeWeight();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
index ecf0a1c..3fe951d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link NoopSecureSessionSpi}.
  */
-@IgniteMBeanDescription("MBean that provides access to no-op secure session 
SPI configuration.")
+@IgniteMXBeanDescription("MBean that provides access to no-op secure session 
SPI configuration.")
 public interface NoopSecureSessionSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
index 07a91a6..8c1caeb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMBean.java
@@ -23,14 +23,14 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link FileSwapSpaceSpi}.
  */
-@IgniteMBeanDescription("MBean that provides configuration information on 
file-based swapspace SPI.")
+@IgniteMXBeanDescription("MBean that provides configuration information on 
file-based swapspace SPI.")
 public interface FileSwapSpaceSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets base directory.
      *
      * @return Base directory.
      */
-    @IgniteMBeanDescription("Base directory.")
+    @IgniteMXBeanDescription("Base directory.")
     public String getBaseDirectory();
 
     /**
@@ -38,7 +38,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum sparsity.
      */
-    @IgniteMBeanDescription("Maximum sparsity.")
+    @IgniteMXBeanDescription("Maximum sparsity.")
     public float getMaximumSparsity();
 
     /**
@@ -46,7 +46,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Write buffer size in bytes.
      */
-    @IgniteMBeanDescription("Write buffer size in bytes.")
+    @IgniteMXBeanDescription("Write buffer size in bytes.")
     public int getWriteBufferSize();
 
     /**
@@ -54,7 +54,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max write queue size in bytes.
      */
-    @IgniteMBeanDescription("Max write queue size in bytes.")
+    @IgniteMXBeanDescription("Max write queue size in bytes.")
     public int getMaxWriteQueueSize();
 
     /**
@@ -62,6 +62,6 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Read pool size.
      */
-    @IgniteMBeanDescription("Read pool size.")
+    @IgniteMXBeanDescription("Read pool size.")
     public int getReadStripesNumber();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
index 67edc37..cdc944d 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
@@ -23,14 +23,14 @@ import org.jetbrains.annotations.*;
 /**
  * Streamer MBean interface.
  */
-@IgniteMBeanDescription("MBean that provides access to streamer description 
and metrics.")
+@IgniteMXBeanDescription("MBean that provides access to streamer description 
and metrics.")
 public interface StreamerMBean {
     /**
      * Gets streamer name.
      *
      * @return Streamer name.
      */
-    @IgniteMBeanDescription("Streamer name.")
+    @IgniteMXBeanDescription("Streamer name.")
     @Nullable public String getName();
 
     /**
@@ -38,7 +38,7 @@ public interface StreamerMBean {
      *
      * @return {@code True} if {@code atLeastOnce} is configured.
      */
-    @IgniteMBeanDescription("True if atLeastOnce is configured.")
+    @IgniteMXBeanDescription("True if atLeastOnce is configured.")
     public boolean isAtLeastOnce();
 
     /**
@@ -47,7 +47,7 @@ public interface StreamerMBean {
      *
      * @return Stage future map size.
      */
-    @IgniteMBeanDescription("Stage future map size.")
+    @IgniteMXBeanDescription("Stage future map size.")
     public int getStageFutureMapSize();
 
     /**
@@ -55,7 +55,7 @@ public interface StreamerMBean {
      *
      * @return Batch future map size.
      */
-    @IgniteMBeanDescription("Batch future map size.")
+    @IgniteMXBeanDescription("Batch future map size.")
     public int getBatchFutureMapSize();
 
     /**
@@ -63,7 +63,7 @@ public interface StreamerMBean {
      *
      * @return Number of stages. Cannot be more than pool thread count.
      */
-    @IgniteMBeanDescription("Number of stages currently being executed in 
streamer pool.")
+    @IgniteMXBeanDescription("Number of stages currently being executed in 
streamer pool.")
     public int getStageActiveExecutionCount();
 
     /**
@@ -71,7 +71,7 @@ public interface StreamerMBean {
      *
      * @return Number of event batches waiting to be processed.
      */
-    @IgniteMBeanDescription("Number of event batches currently waiting to be 
executed.")
+    @IgniteMXBeanDescription("Number of event batches currently waiting to be 
executed.")
     public int getStageWaitingExecutionCount();
 
     /**
@@ -79,7 +79,7 @@ public interface StreamerMBean {
      *
      * @return Total number of stages executed since last reset.
      */
-    @IgniteMBeanDescription("Total number of stages executed since last 
reset.")
+    @IgniteMXBeanDescription("Total number of stages executed since last 
reset.")
     public long getStageTotalExecutionCount();
 
     /**
@@ -89,7 +89,7 @@ public interface StreamerMBean {
      *
      * @return Pipeline maximum execution time.
      */
-    @IgniteMBeanDescription("Pipeline maximum execution time.")
+    @IgniteMXBeanDescription("Pipeline maximum execution time.")
     public long getPipelineMaximumExecutionTime();
 
     /**
@@ -99,7 +99,7 @@ public interface StreamerMBean {
      *
      * @return Pipeline minimum execution time.
      */
-    @IgniteMBeanDescription("Pipeline minimum execution time.")
+    @IgniteMXBeanDescription("Pipeline minimum execution time.")
     public long getPipelineMinimumExecutionTime();
 
     /**
@@ -108,7 +108,7 @@ public interface StreamerMBean {
      *
      * @return Pipeline average execution time.
      */
-    @IgniteMBeanDescription("Pipeline average execution time.")
+    @IgniteMXBeanDescription("Pipeline average execution time.")
     public long getPipelineAverageExecutionTime();
 
     /**
@@ -117,7 +117,7 @@ public interface StreamerMBean {
      *
      * @return Maximum number of unique nodes in pipeline execution.
      */
-    @IgniteMBeanDescription("Maximum number of unique nodes participated in 
pipeline execution.")
+    @IgniteMXBeanDescription("Maximum number of unique nodes participated in 
pipeline execution.")
     public int getPipelineMaximumExecutionNodes();
 
     /**
@@ -126,7 +126,7 @@ public interface StreamerMBean {
      *
      * @return Minimum number of unique nodes in pipeline execution.
      */
-    @IgniteMBeanDescription("Minimum number of unique nodes participated in 
pipeline execution.")
+    @IgniteMXBeanDescription("Minimum number of unique nodes participated in 
pipeline execution.")
     public int getPipelineMinimumExecutionNodes();
 
     /**
@@ -135,7 +135,7 @@ public interface StreamerMBean {
      *
      * @return Average number of unique nodes in pipeline execution.
      */
-    @IgniteMBeanDescription("Average number of unique nodes participated in 
pipeline execution.")
+    @IgniteMXBeanDescription("Average number of unique nodes participated in 
pipeline execution.")
     public int getPipelineAverageExecutionNodes();
 
     /**
@@ -145,7 +145,7 @@ public interface StreamerMBean {
      *
      * @return Number of current active sessions.
      */
-    @IgniteMBeanDescription("Number of current active sessions.")
+    @IgniteMXBeanDescription("Number of current active sessions.")
     public int getCurrentActiveSessions();
 
     /**
@@ -155,7 +155,7 @@ public interface StreamerMBean {
      *
      * @return Maximum active sessions since last reset.
      */
-    @IgniteMBeanDescription("Maximum number of active sessions since last 
reset.")
+    @IgniteMXBeanDescription("Maximum number of active sessions since last 
reset.")
     public int getMaximumActiveSessions();
 
     /**
@@ -164,6 +164,6 @@ public interface StreamerMBean {
      *
      * @return Failures count.
      */
-    @IgniteMBeanDescription("Number of failures since last reset.")
+    @IgniteMXBeanDescription("Number of failures since last reset.")
     public int getFailuresCount();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
index 7769b81..5651f7c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
@@ -22,14 +22,14 @@ import org.apache.ignite.mxbean.*;
 /**
  * Streamer stage MBean.
  */
-@IgniteMBeanDescription("MBean that provides access to streamer stage 
description and metrics.")
+@IgniteMXBeanDescription("MBean that provides access to streamer stage 
description and metrics.")
 public interface StreamerStageMBean {
     /**
      * Gets stage name.
      *
      * @return Stage name.
      */
-    @IgniteMBeanDescription("Stage name.")
+    @IgniteMXBeanDescription("Stage name.")
     public String getName();
 
     /**
@@ -37,7 +37,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage class name.
      */
-    @IgniteMBeanDescription("Stage class name.")
+    @IgniteMXBeanDescription("Stage class name.")
     public String getStageClassName();
 
     /**
@@ -45,7 +45,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage minimum execution time.
      */
-    @IgniteMBeanDescription("Stage minimum execution time.")
+    @IgniteMXBeanDescription("Stage minimum execution time.")
     public long getMinimumExecutionTime();
 
     /**
@@ -53,7 +53,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage maximum execution time.
      */
-    @IgniteMBeanDescription("Stage maximum execution time.")
+    @IgniteMXBeanDescription("Stage maximum execution time.")
     public long getMaximumExecutionTime();
 
     /**
@@ -61,7 +61,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage average execution time.
      */
-    @IgniteMBeanDescription("Stage average execution time.")
+    @IgniteMXBeanDescription("Stage average execution time.")
     public long getAverageExecutionTime();
 
     /**
@@ -69,7 +69,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage minimum waiting time.
      */
-    @IgniteMBeanDescription("Stage minimum waiting time.")
+    @IgniteMXBeanDescription("Stage minimum waiting time.")
     public long getMinimumWaitingTime();
 
     /**
@@ -77,7 +77,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage maximum waiting time.
      */
-    @IgniteMBeanDescription("Stage maximum waiting time.")
+    @IgniteMXBeanDescription("Stage maximum waiting time.")
     public long getMaximumWaitingTime();
 
     /**
@@ -85,7 +85,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage average waiting time.
      */
-    @IgniteMBeanDescription("Stage average waiting time.")
+    @IgniteMXBeanDescription("Stage average waiting time.")
     public long getAverageWaitingTime();
 
     /**
@@ -93,7 +93,7 @@ public interface StreamerStageMBean {
      *
      * @return Number of times this stage was executed.
      */
-    @IgniteMBeanDescription("Number of times this stage was executed.")
+    @IgniteMXBeanDescription("Number of times this stage was executed.")
     public long getTotalExecutionCount();
 
     /**
@@ -101,7 +101,7 @@ public interface StreamerStageMBean {
      *
      * @return Stage failure count.
      */
-    @IgniteMBeanDescription("Stage failure count.")
+    @IgniteMXBeanDescription("Stage failure count.")
     public int getFailuresCount();
 
     /**
@@ -109,6 +109,6 @@ public interface StreamerStageMBean {
      *
      * @return {@code True} if stage is executing now.
      */
-    @IgniteMBeanDescription("Whether stage is currently being executed.")
+    @IgniteMXBeanDescription("Whether stage is currently being executed.")
     public boolean isExecuting();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
index 734c690..4a78d1d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
@@ -22,14 +22,14 @@ import org.apache.ignite.mxbean.*;
 /**
  * Streamer window MBean.
  */
-@IgniteMBeanDescription("MBean that provides access to streamer window 
description.")
+@IgniteMXBeanDescription("MBean that provides access to streamer window 
description.")
 public interface StreamerWindowMBean {
     /**
      * Gets window name.
      *
      * @return Window name.
      */
-    @IgniteMBeanDescription("Window name.")
+    @IgniteMXBeanDescription("Window name.")
     public String getName();
 
     /**
@@ -37,7 +37,7 @@ public interface StreamerWindowMBean {
      *
      * @return Window class name.
      */
-    @IgniteMBeanDescription("Window class name.")
+    @IgniteMXBeanDescription("Window class name.")
     public String getClassName();
 
     /**
@@ -45,7 +45,7 @@ public interface StreamerWindowMBean {
      *
      * @return Current window size.
      */
-    @IgniteMBeanDescription("Window size.")
+    @IgniteMXBeanDescription("Window size.")
     public int getSize();
 
     /**
@@ -53,6 +53,6 @@ public interface StreamerWindowMBean {
      *
      * @return Eviction queue size estimate.
      */
-    @IgniteMBeanDescription("Eviction queue size estimate.")
+    @IgniteMXBeanDescription("Eviction queue size estimate.")
     public int getEvictionQueueSize();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
index 37b7d0c..c162215 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
@@ -29,7 +29,7 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Index name.
      */
-    @IgniteMBeanDescription("Index name.")
+    @IgniteMXBeanDescription("Index name.")
     @Nullable public String name();
 
     /**
@@ -37,7 +37,7 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Index updater class.
      */
-    @IgniteMBeanDescription("Index updater class name.")
+    @IgniteMXBeanDescription("Index updater class name.")
     public String updaterClass();
 
     /**
@@ -45,7 +45,7 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Index unique flag.
      */
-    @IgniteMBeanDescription("Index unique flag.")
+    @IgniteMXBeanDescription("Index unique flag.")
     public boolean unique();
 
     /**
@@ -53,7 +53,7 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Index sorted flag.
      */
-    @IgniteMBeanDescription("Index sorted flag.")
+    @IgniteMXBeanDescription("Index sorted flag.")
     public boolean sorted();
 
     /**
@@ -61,7 +61,7 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Index policy.
      */
-    @IgniteMBeanDescription("Index policy.")
+    @IgniteMXBeanDescription("Index policy.")
     public StreamerIndexPolicy policy();
 
     /**
@@ -69,6 +69,6 @@ public interface StreamerIndexProviderMBean {
      *
      * @return Current index size.
      */
-    @IgniteMBeanDescription("Current index size.")
+    @IgniteMXBeanDescription("Current index size.")
     public int size();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index d5139f0..067e5e4 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -360,7 +360,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
 
             taskSes.saveCheckpoint(key1, val1, GLOBAL_SCOPE, 0);
 
-            ((IgniteMBean) ignite).removeCheckpoint(key1);
+            ((IgniteMXBean) ignite).removeCheckpoint(key1);
 
             // This checkpoint will not be automatically removed for cache SPI.
             taskSes.saveCheckpoint(key1, val1, GLOBAL_SCOPE, 5000);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
index edb98ff..4facba8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.util.mbeans;
 
+import org.apache.ignite.internal.mxbean.*;
 import org.apache.ignite.mxbean.*;
 import org.apache.ignite.testframework.junits.common.*;
 import javax.management.*;
@@ -31,7 +32,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest 
{
      * @throws Exception Thrown if test fails.
      */
     public void testCorrectMBeanInfo() throws Exception {
-        StandardMBean mbean = new IgniteStandardMBean(new 
GridMBeanImplementation(), GridMBeanInterface.class);
+        StandardMBean mbean = new IgniteStandardMXBean(new 
GridMBeanImplementation(), GridMBeanInterface.class);
 
         MBeanInfo info =  mbean.getMBeanInfo();
 
@@ -77,7 +78,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest 
{
      */
     public void testMissedNameMBeanInfo() throws Exception {
         try {
-            StandardMBean mbean = new IgniteStandardMBean(new 
GridMBeanImplementation(), GridMBeanInterfaceBad.class);
+            StandardMBean mbean = new IgniteStandardMXBean(new 
GridMBeanImplementation(), GridMBeanInterfaceBad.class);
 
             mbean.getMBeanInfo();
         }
@@ -94,7 +95,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest 
{
      */
     public void testMissedDescriptionMBeanInfo() throws Exception {
         try {
-            StandardMBean mbean = new IgniteStandardMBean(new 
GridMBeanImplementation(),
+            StandardMBean mbean = new IgniteStandardMXBean(new 
GridMBeanImplementation(),
                 GridMBeanInterfaceBadAgain.class);
 
             mbean.getMBeanInfo();
@@ -112,7 +113,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
      */
     public void testEmptyDescriptionMBeanInfo() throws Exception {
         try {
-            StandardMBean mbean = new IgniteStandardMBean(new 
GridMBeanImplementation(),
+            StandardMBean mbean = new IgniteStandardMXBean(new 
GridMBeanImplementation(),
                 GridMBeanInterfaceEmptyDescription.class);
 
             mbean.getMBeanInfo();
@@ -130,7 +131,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
      */
     public void testEmptyNameMBeanInfo() throws Exception {
         try {
-            StandardMBean mbean = new IgniteStandardMBean(new 
GridMBeanImplementation(),
+            StandardMBean mbean = new IgniteStandardMXBean(new 
GridMBeanImplementation(),
                 GridMBeanInterfaceEmptyName.class);
 
             mbean.getMBeanInfo();
@@ -151,7 +152,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          *
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanROGetter.")
+        @IgniteMXBeanDescription("MBeanROGetter.")
         public String getROData();
 
         /**
@@ -160,23 +161,23 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanSuperOperation.")
-        @IgniteMBeanParametersNames({"someData"})
-        @IgniteMBeanParametersDescriptions({"MBeanOperationParameter1."})
+        @IgniteMXBeanDescription("MBeanSuperOperation.")
+        @IgniteMXBeanParametersNames({"someData"})
+        @IgniteMXBeanParametersDescriptions({"MBeanOperationParameter1."})
         public String doSomethingSuper(String someData);
     }
 
     /**
      * Test MBean interface.
      */
-    @IgniteMBeanDescription("MBeanDescription.")
+    @IgniteMXBeanDescription("MBeanDescription.")
     public static interface GridMBeanInterface extends GridMBeanSuperInterface 
{
         /**
          * Test getter.
          *
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanWritableGetter.")
+        @IgniteMXBeanDescription("MBeanWritableGetter.")
         public String getWritableData();
 
         /**
@@ -191,7 +192,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          *
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanReadonlyGetter.")
+        @IgniteMXBeanDescription("MBeanReadonlyGetter.")
         public String getReadOnlyData();
 
         /**
@@ -199,7 +200,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          *
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanWritableIsGetter.")
+        @IgniteMXBeanDescription("MBeanWritableIsGetter.")
         public boolean isWritable();
 
         /**
@@ -215,9 +216,9 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanOperation.")
-        @IgniteMBeanParametersNames({"ignored", "someData"})
-        @IgniteMBeanParametersDescriptions({"MBeanOperationParameter1.", 
"MBeanOperationParameter2."})
+        @IgniteMXBeanDescription("MBeanOperation.")
+        @IgniteMXBeanParametersNames({"ignored", "someData"})
+        @IgniteMXBeanParametersDescriptions({"MBeanOperationParameter1.", 
"MBeanOperationParameter2."})
         public String doSomething(boolean ignored, String someData);
     }
 
@@ -232,9 +233,9 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanOperation.")
-        @IgniteMBeanParametersNames({"ignored"})
-        @IgniteMBeanParametersDescriptions({"MBeanOperationParameter1.", 
"MBeanOperationParameter2."})
+        @IgniteMXBeanDescription("MBeanOperation.")
+        @IgniteMXBeanParametersNames({"ignored"})
+        @IgniteMXBeanParametersDescriptions({"MBeanOperationParameter1.", 
"MBeanOperationParameter2."})
         public String doSomethingBad(boolean ignored, String someData);
     }
 
@@ -249,7 +250,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanDescription("")
+        @IgniteMXBeanDescription("")
         public String doSomethingBad(boolean ignored, String someData);
     }
 
@@ -264,7 +265,7 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanParametersNames({"", "someData"})
+        @IgniteMXBeanParametersNames({"", "someData"})
         public String doSomethingBadAgain(boolean ignored, String someData);
     }
 
@@ -279,9 +280,9 @@ public class GridMBeanSelfTest extends 
GridCommonAbstractTest {
          * @param someData Some data.
          * @return Some string.
          */
-        @IgniteMBeanDescription("MBeanOperation.")
-        @IgniteMBeanParametersNames({"ignored", "someData"})
-        @IgniteMBeanParametersDescriptions({"MBeanOperationParameter1."})
+        @IgniteMXBeanDescription("MBeanOperation.")
+        @IgniteMXBeanParametersNames({"ignored", "someData"})
+        @IgniteMXBeanParametersDescriptions({"MBeanOperationParameter1."})
         public String doSomethingBadAgain(boolean ignored, String someData);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b6cd806/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
 
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
index dbd473a..84648d2 100644
--- 
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
+++ 
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
@@ -25,14 +25,14 @@ import java.util.*;
 /**
  * Management bean for {@link GridUriDeploymentSpi}.
  */
-@IgniteMBeanDescription("MBean that provides access to URI deployment SPI 
configuration.")
+@IgniteMXBeanDescription("MBean that provides access to URI deployment SPI 
configuration.")
 public interface GridUriDeploymentSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets temporary directory path.
      *
      * @return Temporary directory path.
      */
-    @IgniteMBeanDescription("Temporary directory path.")
+    @IgniteMXBeanDescription("Temporary directory path.")
     public String getTemporaryDirectoryPath();
 
     /**
@@ -40,7 +40,7 @@ public interface GridUriDeploymentSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return List of URIs.
      */
-    @IgniteMBeanDescription("List of URIs.")
+    @IgniteMXBeanDescription("List of URIs.")
     public List<String> getUriList();
 
     /**
@@ -48,6 +48,6 @@ public interface GridUriDeploymentSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return if files are ckecked for redundancy.
      */
-    @IgniteMBeanDescription("Indicates if MD5 check is enabled.")
+    @IgniteMXBeanDescription("Indicates if MD5 check is enabled.")
     public boolean isCheckMd5();
 }

Reply via email to