http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java 
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
new file mode 100644
index 0000000..dfc759c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanDescription.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.ignite.mxbean;
+
+import java.lang.annotation.*;
+
+/**
+ * Provides description for MBean classes and methods.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+public @interface MXBeanDescription {
+    /**
+     *
+     * Description for Mbean.
+     */
+    @SuppressWarnings({"JavaDoc"}) public String value();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
 
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
new file mode 100644
index 0000000..1337e07
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersDescriptions.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.ignite.mxbean;
+
+import java.lang.annotation.*;
+
+/**
+ * Provides MBean method parameters description.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface MXBeanParametersDescriptions {
+    /**
+     *
+     * Array of descriptions for parameters.
+     */
+    @SuppressWarnings({"JavaDoc"}) public String[] value();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
 
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
new file mode 100644
index 0000000..3fc7885
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/mxbean/MXBeanParametersNames.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.ignite.mxbean;
+
+import java.lang.annotation.*;
+
+/**
+ * Provides MBean method parameters names.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface MXBeanParametersNames {
+    /**
+     *
+     * Array of parameter names in MBean.
+     */
+    @SuppressWarnings({"JavaDoc"}) public String[] value();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java 
b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
new file mode 100644
index 0000000..5e48574
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/ThreadPoolMXBean.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.ignite.mxbean;
+
+/**
+ * MBean that provides access to information about executor service.
+ */
+@MXBeanDescription("MBean that provides access to information about executor 
service.")
+public interface ThreadPoolMXBean {
+    /**
+     * Returns the approximate number of threads that are actively executing 
tasks.
+     *
+     * @return The number of threads.
+     */
+    @MXBeanDescription("Approximate number of threads that are actively 
executing tasks.")
+    public int getActiveCount();
+
+    /**
+     * Returns the approximate total number of tasks that have completed 
execution.
+     * Because the states of tasks and threads may change dynamically during
+     * computation, the returned value is only an approximation, but one that
+     * does not ever decrease across successive calls.
+     *
+     * @return The number of tasks.
+     */
+    @MXBeanDescription("Approximate total number of tasks that have completed 
execution.")
+    public long getCompletedTaskCount();
+
+    /**
+     * Returns the core number of threads.
+     *
+     * @return The core number of threads.
+     */
+    @MXBeanDescription("The core number of threads.")
+    public int getCorePoolSize();
+
+    /**
+     * Returns the largest number of threads that have ever
+     * simultaneously been in the pool.
+     *
+     * @return The number of threads.
+     */
+    @MXBeanDescription("Largest number of threads that have ever 
simultaneously been in the pool.")
+    public int getLargestPoolSize();
+
+    /**
+     * Returns the maximum allowed number of threads.
+     *
+     * @return The maximum allowed number of threads.
+     */
+    @MXBeanDescription("The maximum allowed number of threads.")
+    public int getMaximumPoolSize();
+
+    /**
+     * Returns the current number of threads in the pool.
+     *
+     * @return The number of threads.
+     */
+    @MXBeanDescription("Current number of threads in the pool.")
+    public int getPoolSize();
+
+    /**
+     * Returns the approximate total number of tasks that have been scheduled
+     * for execution. Because the states of tasks and threads may change 
dynamically
+     * during computation, the returned value is only an approximation, but
+     * one that does not ever decrease across successive calls.
+     *
+     * @return The number of tasks.
+     */
+    @MXBeanDescription("Approximate total number of tasks that have been 
scheduled for execution.")
+    public long getTaskCount();
+
+    /**
+     * Gets current size of the execution queue. This queue buffers local
+     * executions when there are not threads available for processing in the 
pool.
+     *
+     * @return Current size of the execution queue.
+     */
+    @MXBeanDescription("Current size of the execution queue.")
+    public int getQueueSize();
+
+    /**
+     * Returns the thread keep-alive time, which is the amount of time which 
threads
+     * in excess of the core pool size may remain idle before being terminated.
+     *
+     * @return Keep alive time.
+     */
+    @MXBeanDescription("Thread keep-alive time, which is the amount of time 
which threads in excess of " +
+        "the core pool size may remain idle before being terminated.")
+    public long getKeepAliveTime();
+
+    /**
+     * Returns {@code true} if this executor has been shut down.
+     *
+     * @return {@code True} if this executor has been shut down.
+     */
+    @MXBeanDescription("True if this executor has been shut down.")
+    public boolean isShutdown();
+
+    /**
+     * Returns {@code true} if all tasks have completed following shut down. 
Note that
+     * {@code isTerminated()} is never {@code true} unless either {@code 
shutdown()} or
+     * {@code shutdownNow()} was called first.
+     *
+     * @return {@code True} if all tasks have completed following shut down.
+     */
+    @MXBeanDescription("True if all tasks have completed following shut down.")
+    public boolean isTerminated();
+
+    /**
+     * Returns {@code true} if this executor is in the process of terminating 
after
+     * {@code shutdown()} or {@code shutdownNow()} but has not completely 
terminated.
+     * This method may be useful for debugging. A return of {@code true} 
reported a
+     * sufficient period after shutdown may indicate that submitted tasks have 
ignored
+     * or suppressed interruption, causing this executor not to properly 
terminate.
+     *
+     * @return {@code True} if terminating but not yet terminated.
+     */
+    @MXBeanDescription("True if terminating but not yet terminated.")
+    public boolean isTerminating();
+
+    /**
+     * Returns the class name of current rejection handler.
+     *
+     * @return Class name of current rejection handler.
+     */
+    @MXBeanDescription("Class name of current rejection handler.")
+    public String getRejectedExecutionHandlerClass();
+
+    /**
+     * Returns the class name of thread factory used to create new threads.
+     *
+     * @return Class name of thread factory used to create new threads.
+     */
+    @MXBeanDescription("Class name of thread factory used to create new 
threads.")
+    public String getThreadFactoryClass();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
index 4e5cf4a..a311cd40 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
@@ -32,7 +32,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return String presentation of the start timestamp.
      */
-    @IgniteMXBeanDescription("String presentation of the start timestamp.")
+    @MXBeanDescription("String presentation of the start timestamp.")
     public String getStartTimestampFormatted();
 
     /**
@@ -40,7 +40,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return String presentation of up-time for this SPI.
      */
-    @IgniteMXBeanDescription("String presentation of up-time for this SPI.")
+    @MXBeanDescription("String presentation of up-time for this SPI.")
     public String getUpTimeFormatted();
 
     /**
@@ -48,7 +48,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return Start timestamp of this SPI.
      */
-    @IgniteMXBeanDescription("Start timestamp of this SPI.")
+    @MXBeanDescription("Start timestamp of this SPI.")
     public long getStartTimestamp();
 
     /**
@@ -56,7 +56,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return Up-time of this SPI.
      */
-    @IgniteMXBeanDescription("Up-time of this SPI in milliseconds.")
+    @MXBeanDescription("Up-time of this SPI in milliseconds.")
     public long getUpTime();
 
     /**
@@ -64,7 +64,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return Gridgain installation home folder.
      */
-    @IgniteMXBeanDescription("Gridgain installation home folder.")
+    @MXBeanDescription("Gridgain installation home folder.")
     public String getGridGainHome();
 
     /**
@@ -72,7 +72,7 @@ public interface IgniteSpiManagementMBean {
      *
      * @return ID of the local node.
      */
-    @IgniteMXBeanDescription("ID of the local node.")
+    @MXBeanDescription("ID of the local node.")
     public UUID getLocalNodeId();
 
     /**
@@ -80,6 +80,6 @@ public interface IgniteSpiManagementMBean {
      *
      * @return Name of the SPI.
      */
-    @IgniteMXBeanDescription("Name of the SPI.")
+    @MXBeanDescription("Name of the SPI.")
     public String getName();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java
index c0e54e9..1f95804 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpiMBean.java
@@ -23,7 +23,7 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean for {@link NoopAuthenticationSpi}.
  */
-@IgniteMXBeanDescription("MBean that provides access to no-op authentication 
SPI configuration.")
+@MXBeanDescription("MBean that provides access to no-op authentication SPI 
configuration.")
 public interface NoopAuthenticationSpiMBean extends IgniteSpiManagementMBean {
     // No-op.
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
index 7ff7118..976d2eb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiMBean.java
@@ -26,13 +26,13 @@ import org.apache.ignite.spi.*;
  *
  *
  */
-@IgniteMXBeanDescription("MBean provides information about cache checkpoint 
SPI.")
+@MXBeanDescription("MBean provides information about cache checkpoint SPI.")
 public interface CacheCheckpointSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets cache name to be used by this SPI..
      *
      * @return Cache name to be used by this SPI.
      */
-    @IgniteMXBeanDescription("Cache name to be used by this SPI.")
+    @MXBeanDescription("Cache name to be used by this SPI.")
     public String getCacheName();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
index 930cde5..5deec18 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiMBean.java
@@ -25,14 +25,14 @@ import org.apache.ignite.spi.*;
  * Management bean that provides general administrative and configuration 
information
  * about jdbc checkpoint SPI.
  */
-@IgniteMXBeanDescription("MBean that provides information about jdbc 
checkpoint SPI.")
+@MXBeanDescription("MBean that provides information about jdbc checkpoint 
SPI.")
 public interface JdbcCheckpointSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets number of retries in case of DB failure.
      *
      * @return Number of retries.
      */
-    @IgniteMXBeanDescription("Number of retries.")
+    @MXBeanDescription("Number of retries.")
     public int getNumberOfRetries();
 
     /**
@@ -40,7 +40,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Description for data source.
      */
-    @IgniteMXBeanDescription("Data source description.")
+    @MXBeanDescription("Data source description.")
     public String getDataSourceInfo();
 
     /**
@@ -48,7 +48,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return User name for checkpoint jdbc.
      */
-    @IgniteMXBeanDescription("User name for checkpoint database.")
+    @MXBeanDescription("User name for checkpoint database.")
     public String getUser();
 
     /**
@@ -56,7 +56,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Password for checkpoint jdbc.
      */
-    @IgniteMXBeanDescription("Password for checkpoint database.")
+    @MXBeanDescription("Password for checkpoint database.")
     public String getPwd();
 
     /**
@@ -64,7 +64,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Checkpoint table name.
      */
-    @IgniteMXBeanDescription("Checkpoint table name.")
+    @MXBeanDescription("Checkpoint table name.")
     public String getCheckpointTableName();
 
     /**
@@ -72,7 +72,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Key field name for checkpoint table.
      */
-    @IgniteMXBeanDescription("Key field name for checkpoint table.")
+    @MXBeanDescription("Key field name for checkpoint table.")
     public String getKeyFieldName();
 
     /**
@@ -80,7 +80,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Key field type for checkpoint table.
      */
-    @IgniteMXBeanDescription("Key field type for checkpoint table.")
+    @MXBeanDescription("Key field type for checkpoint table.")
     public String getKeyFieldType();
 
     /**
@@ -88,7 +88,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Value field name for checkpoint table.
      */
-    @IgniteMXBeanDescription("Value field name for checkpoint table.")
+    @MXBeanDescription("Value field name for checkpoint table.")
     public String getValueFieldName();
 
     /**
@@ -96,7 +96,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Value field type for checkpoint table.
      */
-    @IgniteMXBeanDescription("Value field type for checkpoint table.")
+    @MXBeanDescription("Value field type for checkpoint table.")
     public String getValueFieldType();
 
     /**
@@ -104,7 +104,7 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Create date field name for checkpoint table.
      */
-    @IgniteMXBeanDescription("Expiration date field name for checkpoint 
table.")
+    @MXBeanDescription("Expiration date field name for checkpoint table.")
     public String getExpireDateFieldName();
 
     /**
@@ -112,6 +112,6 @@ public interface JdbcCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Expiration date field type for checkpoint table.
      */
-    @IgniteMXBeanDescription("Expiration date field type for checkpoint 
table.")
+    @MXBeanDescription("Expiration date field type for checkpoint table.")
     public String getExpireDateFieldType();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
index 2ef4634..2fc051f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpiMBean.java
@@ -26,14 +26,14 @@ import java.util.*;
  * Management bean that provides general administrative and configuration 
information
  * about shared file system checkpoints.
  */
-@IgniteMXBeanDescription("MBean for shared file system based checkpoint SPI.")
+@MXBeanDescription("MBean for shared file system based checkpoint SPI.")
 public interface SharedFsCheckpointSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets path to the directory where all checkpoints are saved.
      *
      * @return Path to the checkpoints directory.
      */
-    @IgniteMXBeanDescription("Gets path to the directory where all checkpoints 
are saved.")
+    @MXBeanDescription("Gets path to the directory where all checkpoints are 
saved.")
     public String getCurrentDirectoryPath();
 
 
@@ -42,6 +42,6 @@ public interface SharedFsCheckpointSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Collection of all configured paths.
      */
-    @IgniteMXBeanDescription("Gets collection of all configured paths where 
checkpoints can be saved.")
+    @MXBeanDescription("Gets collection of all configured paths where 
checkpoints can be saved.")
     public Collection<String> getDirectoryPaths();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
index ccf56c0..b69a38d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpiMBean.java
@@ -23,14 +23,14 @@ import org.apache.ignite.spi.*;
 /**
  * Management bean that provides access to the FIFO queue collision SPI 
configuration.
  */
-@IgniteMXBeanDescription("MBean provides information about FIFO queue based 
collision SPI configuration.")
+@MXBeanDescription("MBean provides information about FIFO queue based 
collision SPI configuration.")
 public interface FifoQueueCollisionSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets number of jobs that can be executed in parallel.
      *
      * @return Number of jobs that can be executed in parallel.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("Number of jobs that can be executed in parallel.")
     public int getParallelJobsNumber();
 
     /**
@@ -38,7 +38,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param num Parallel jobs number.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("Number of jobs that can be executed in parallel.")
     public void setParallelJobsNumber(int num);
 
     /**
@@ -47,7 +47,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum allowed number of waiting jobs.
      */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
+    @MXBeanDescription("Maximum allowed number of waiting jobs.")
     public int getWaitingJobsNumber();
 
     /**
@@ -56,7 +56,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param num Waiting jobs number.
      */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
+    @MXBeanDescription("Maximum allowed number of waiting jobs.")
     public void setWaitingJobsNumber(int num);
 
     /**
@@ -64,7 +64,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of jobs that wait for execution.
      */
-    @IgniteMXBeanDescription("Number of jobs that wait for execution.")
+    @MXBeanDescription("Number of jobs that wait for execution.")
     public int getCurrentWaitJobsNumber();
 
     /**
@@ -72,7 +72,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of active jobs.
      */
-    @IgniteMXBeanDescription("Number of active jobs.")
+    @MXBeanDescription("Number of active jobs.")
     public int getCurrentActiveJobsNumber();
 
     /*
@@ -80,7 +80,7 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of currently running (not {@code 'held}) jobs.
      */
-    @IgniteMXBeanDescription("Number of running jobs.")
+    @MXBeanDescription("Number of running jobs.")
     public int getCurrentRunningJobsNumber();
 
     /**
@@ -88,6 +88,6 @@ public interface FifoQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of currently {@code 'held'} jobs.
      */
-    @IgniteMXBeanDescription("Number of held jobs.")
+    @MXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 6918542..518fd38 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.
  */
-@IgniteMXBeanDescription("MBean for job stealing based collision SPI.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs to be stolen.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that wait for execution.")
+    @MXBeanDescription("Number of jobs that wait for execution.")
     public int getCurrentWaitJobsNumber();
 
     /**
@@ -50,7 +50,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of active jobs.
      */
-    @IgniteMXBeanDescription("Number of active jobs.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of running jobs.")
+    @MXBeanDescription("Number of running jobs.")
     public int getCurrentRunningJobsNumber();
 
     /**
@@ -66,7 +66,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of currently {@code 'held'} jobs.
      */
-    @IgniteMXBeanDescription("Number of held jobs.")
+    @MXBeanDescription("Number of held jobs.")
     public int getCurrentHeldJobsNumber();
 
     /**
@@ -74,7 +74,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Number of stolen jobs.
      */
-    @IgniteMXBeanDescription("Number of stolen jobs.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Job count threshold.")
+    @MXBeanDescription("Job count threshold.")
     public int getWaitJobsThreshold();
 
     /**
@@ -108,7 +108,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param waitJobsThreshold Job count threshold.
      */
-    @IgniteMXBeanDescription("Job count threshold.")
+    @MXBeanDescription("Job count threshold.")
     public void setWaitJobsThreshold(int waitJobsThreshold);
 
     /**
@@ -119,7 +119,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message expire time.
      */
-    @IgniteMXBeanDescription("Message expire time.")
+    @MXBeanDescription("Message expire time.")
     public long getMessageExpireTime();
 
     /**
@@ -130,7 +130,7 @@ public interface JobStealingCollisionSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @param msgExpireTime Message expire time.
      */
-    @IgniteMXBeanDescription("Message expire time.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Flag indicating whether this node should attempt 
to steal jobs from other nodes.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum number of attempts to steal job by 
another node.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum number of attempts to steal job by 
another node.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Node attributes to enable job stealing for.")
+    @MXBeanDescription("Node attributes to enable job stealing for.")
     public Map<String, ? extends Serializable> getStealingAttributes();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 d16dc8f..85f3322 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.
  */
-@IgniteMXBeanDescription("MBean provides access to the priority queue 
collision SPI.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that wait for execution.")
+    @MXBeanDescription("Number of jobs that wait for execution.")
     public int getCurrentWaitJobsNumber();
 
     /**
@@ -38,7 +38,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of active jobs.
      */
-    @IgniteMXBeanDescription("Number of active jobs.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of running jobs.")
+    @MXBeanDescription("Number of running jobs.")
     public int getCurrentRunningJobsNumber();
 
     /**
@@ -54,7 +54,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @return Number of currently {@code 'held'} jobs.
      */
-    @IgniteMXBeanDescription("Number of held jobs.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
+    @MXBeanDescription("Maximum allowed number of waiting jobs.")
     public int getWaitingJobsNumber();
 
     /**
@@ -88,7 +88,7 @@ public interface PriorityQueueCollisionSpiMBean extends 
IgniteSpiManagementMBean
      *
      * @param num Maximium jobs number.
      */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Key name of task priority attribute.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Key name of job priority attribute.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Flag indicating whether job starvation 
prevention is enabled.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Flag indicating whether job starvation 
prevention is enabled.")
+    @MXBeanDescription("Flag indicating whether job starvation prevention is 
enabled.")
     public void setStarvationPreventionEnabled(boolean preventStarvation);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 d7af479..9d44deb 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.
  */
-@IgniteMXBeanDescription("MBean provide access to TCP-based communication 
SPI.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Grid node IP address.")
+    @MXBeanDescription("Grid node IP address.")
     public String getLocalAddress();
 
     /**
@@ -40,7 +40,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Port number.
      */
-    @IgniteMXBeanDescription("Port number.")
+    @MXBeanDescription("Port number.")
     public int getLocalPort();
 
     /**
@@ -48,7 +48,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Port number.
      */
-    @IgniteMXBeanDescription("Shared memory endpoint port number.")
+    @MXBeanDescription("Shared memory endpoint port number.")
     public int getSharedMemoryPort();
 
     /**
@@ -57,7 +57,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Local port range.
      */
-    @IgniteMXBeanDescription("Local port range.")
+    @MXBeanDescription("Local port range.")
     public int getLocalPortRange();
 
     /**
@@ -66,7 +66,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum idle connection time.
      */
-    @IgniteMXBeanDescription("Maximum idle connection time.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Flag that indicates whether direct or heap 
allocated buffer is used.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Count of selectors used in TCP server.")
+    @MXBeanDescription("Count of selectors used in TCP server.")
     public int getSelectorsCount();
 
     /**
@@ -91,7 +91,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Sent messages count.
      */
-    @IgniteMXBeanDescription("Sent messages count.")
+    @MXBeanDescription("Sent messages count.")
     public int getSentMessagesCount();
 
     /**
@@ -99,7 +99,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Sent bytes count.
      */
-    @IgniteMXBeanDescription("Sent bytes count.")
+    @MXBeanDescription("Sent bytes count.")
     public long getSentBytesCount();
 
     /**
@@ -107,7 +107,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Received messages count.
      */
-    @IgniteMXBeanDescription("Received messages count.")
+    @MXBeanDescription("Received messages count.")
     public int getReceivedMessagesCount();
 
     /**
@@ -115,7 +115,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Received bytes count.
      */
-    @IgniteMXBeanDescription("Received bytes count.")
+    @MXBeanDescription("Received bytes count.")
     public long getReceivedBytesCount();
 
     /**
@@ -123,7 +123,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Outbound messages queue size.
      */
-    @IgniteMXBeanDescription("Outbound messages queue size.")
+    @MXBeanDescription("Outbound messages queue size.")
     public int getOutboundMessagesQueueSize();
 
     /**
@@ -132,7 +132,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Connect timeout.
      */
-    @IgniteMXBeanDescription("Connect timeout.")
+    @MXBeanDescription("Connect timeout.")
     public long getConnectTimeout();
 
     /**
@@ -140,7 +140,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum connect timeout.
      */
-    @IgniteMXBeanDescription("Maximum connect timeout.")
+    @MXBeanDescription("Maximum connect timeout.")
     public long getMaxConnectTimeout();
 
     /**
@@ -149,7 +149,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Reconnects count.
      */
-    @IgniteMXBeanDescription("Reconnect count on connection failure.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("TCP_NODELAY socket option value.")
+    @MXBeanDescription("TCP_NODELAY socket option value.")
     public boolean isTcpNoDelay();
 
     /**
@@ -169,7 +169,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Flush frequency.
      */
-    @IgniteMXBeanDescription("Connection buffer flush frequency.")
+    @MXBeanDescription("Connection buffer flush frequency.")
     public long getConnectionBufferFlushFrequency();
 
     /**
@@ -186,7 +186,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      * @param connBufFlushFreq Flush frequency.
      * @see #getConnectionBufferSize()
      */
-    @IgniteMXBeanDescription("Sets connection buffer flush frequency.")
+    @MXBeanDescription("Sets connection buffer flush frequency.")
     public void setConnectionBufferFlushFrequency(long connBufFlushFreq);
 
     /**
@@ -196,7 +196,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Connection buffer size.
      */
-    @IgniteMXBeanDescription("Connection buffer size.")
+    @MXBeanDescription("Connection buffer size.")
     public int getConnectionBufferSize();
 
     /**
@@ -204,7 +204,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return {@code True} if direct buffers should be used.
      */
-    @IgniteMXBeanDescription("Direct send buffer.")
+    @MXBeanDescription("Direct send buffer.")
     public boolean isDirectSendBuffer();
 
     /**
@@ -214,7 +214,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket receive buffer size.
      */
-    @IgniteMXBeanDescription("Socket receive buffer.")
+    @MXBeanDescription("Socket receive buffer.")
     public int getSocketReceiveBuffer();
 
     /**
@@ -224,7 +224,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket send buffer size.
      */
-    @IgniteMXBeanDescription("Socket send buffer.")
+    @MXBeanDescription("Socket send buffer.")
     public int getSocketSendBuffer();
 
     /**
@@ -232,7 +232,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Send queue size limit.
      */
-    @IgniteMXBeanDescription("Message queue size limit.")
+    @MXBeanDescription("Message queue size limit.")
     public int getMessageQueueLimit();
 
     /**
@@ -241,7 +241,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Minimum buffered message count.
      */
-    @IgniteMXBeanDescription("Minimum buffered message count.")
+    @MXBeanDescription("Minimum buffered message count.")
     public int getMinimumBufferedMessageCount();
 
     /**
@@ -250,7 +250,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Buffer size ratio.
      */
-    @IgniteMXBeanDescription("Buffer size ratio.")
+    @MXBeanDescription("Buffer size ratio.")
     public double getBufferSizeRatio();
 
     /**
@@ -259,7 +259,7 @@ public interface TcpCommunicationSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket write timeout for TCP connections.
      */
-    @IgniteMXBeanDescription("Socket write timeout.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Number of received messages after which 
acknowledgment is sent.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum number of unacknowledged messages.")
+    @MXBeanDescription("Maximum number of unacknowledged messages.")
     public int getUnacknowledgedMessagesBufferSize();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 faf00e3..c5ae661 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.
  */
-@IgniteMXBeanDescription("MBean that provides access to local deployment SPI 
configuration.")
+@MXBeanDescription("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/c9b1dfb3/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 f9c00d9..9fe4adc 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.
      */
-    @IgniteMXBeanDescription("Disconnect check interval.")
+    @MXBeanDescription("Disconnect check interval.")
     public long getDisconnectCheckInterval();
 
     /**
@@ -39,7 +39,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Socket timeout.
      */
-    @IgniteMXBeanDescription("Socket timeout.")
+    @MXBeanDescription("Socket timeout.")
     public long getSocketTimeout();
 
     /**
@@ -47,7 +47,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message acknowledgement timeout.
      */
-    @IgniteMXBeanDescription("Message acknowledgement timeout.")
+    @MXBeanDescription("Message acknowledgement timeout.")
     public long getAckTimeout();
 
     /**
@@ -55,7 +55,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Network timeout.
      */
-    @IgniteMXBeanDescription("Network timeout.")
+    @MXBeanDescription("Network timeout.")
     public long getNetworkTimeout();
 
     /**
@@ -63,7 +63,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Thread priority.
      */
-    @IgniteMXBeanDescription("Threads priority.")
+    @MXBeanDescription("Threads priority.")
     public int getThreadPriority();
 
     /**
@@ -71,7 +71,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Time period in milliseconds.
      */
-    @IgniteMXBeanDescription("Heartbeat frequency.")
+    @MXBeanDescription("Heartbeat frequency.")
     public long getHeartbeatFrequency();
 
     /**
@@ -79,7 +79,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return IPFinder (string representation).
      */
-    @IgniteMXBeanDescription("IP Finder.")
+    @MXBeanDescription("IP Finder.")
     public String getIpFinderFormatted();
 
     /**
@@ -87,7 +87,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Message worker queue current size.
      */
-    @IgniteMXBeanDescription("Message worker queue current size.")
+    @MXBeanDescription("Message worker queue current size.")
     public int getMessageWorkerQueueSize();
 
     /**
@@ -95,7 +95,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Nodes joined count.
      */
-    @IgniteMXBeanDescription("Nodes joined count.")
+    @MXBeanDescription("Nodes joined count.")
     public long getNodesJoined();
 
     /**
@@ -103,7 +103,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Left nodes count.
      */
-    @IgniteMXBeanDescription("Nodes left count.")
+    @MXBeanDescription("Nodes left count.")
     public long getNodesLeft();
 
     /**
@@ -111,7 +111,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Failed nodes count.
      */
-    @IgniteMXBeanDescription("Nodes failed count.")
+    @MXBeanDescription("Nodes failed count.")
     public long getNodesFailed();
 
     /**
@@ -119,7 +119,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Avg message processing time.
      */
-    @IgniteMXBeanDescription("Avg message processing time.")
+    @MXBeanDescription("Avg message processing time.")
     public long getAvgMessageProcessingTime();
 
     /**
@@ -127,7 +127,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max message processing time.
      */
-    @IgniteMXBeanDescription("Max message processing time.")
+    @MXBeanDescription("Max message processing time.")
     public long getMaxMessageProcessingTime();
 
     /**
@@ -135,7 +135,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total received messages count.
      */
-    @IgniteMXBeanDescription("Total received messages count.")
+    @MXBeanDescription("Total received messages count.")
     public int getTotalReceivedMessages();
 
     /**
@@ -143,7 +143,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMXBeanDescription("Received messages by type.")
+    @MXBeanDescription("Received messages by type.")
     public Map<String, Integer> getReceivedMessages();
 
     /**
@@ -151,7 +151,7 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Total processed messages count.
      */
-    @IgniteMXBeanDescription("Total processed messages count.")
+    @MXBeanDescription("Total processed messages count.")
     public int getTotalProcessedMessages();
 
     /**
@@ -159,6 +159,6 @@ public interface TcpClientDiscoverySpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Map containing message types and respective counts.
      */
-    @IgniteMXBeanDescription("Received messages by type.")
+    @MXBeanDescription("Received messages by type.")
     public Map<String, Integer> getProcessedMessages();
 }

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 72e90e9..b5f8dff 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>
  */
-@IgniteMXBeanDescription("MBean that provides access to memory event storage 
SPI configuration.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Event time-to-live value.")
+    @MXBeanDescription("Event time-to-live value.")
     public long getExpireAgeMs();
 
     /**
@@ -46,7 +46,7 @@ public interface MemoryEventStorageSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum event queue size.
      */
-    @IgniteMXBeanDescription("Maximum event queue size.")
+    @MXBeanDescription("Maximum event queue size.")
     public long getExpireCount();
 
     /**
@@ -54,12 +54,12 @@ public interface MemoryEventStorageSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Current queue size of the event queue.
      */
-    @IgniteMXBeanDescription("Current event queue size.")
+    @MXBeanDescription("Current event queue size.")
     public long getQueueSize();
 
     /**
      * Removes all events from the event queue.
      */
-    @IgniteMXBeanDescription("Removes all events from the event queue.")
+    @MXBeanDescription("Removes all events from the event queue.")
     public void clearAll();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 3190a90..394415d 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}.
  */
-@IgniteMXBeanDescription("MBean that provides access to always failover SPI 
configuration.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Total number of jobs that were failed over.")
+    @MXBeanDescription("Total number of jobs that were failed over.")
     public int getTotalFailoverJobsCount();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 426fffd..ae40bfa 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}.
  */
-@IgniteMXBeanDescription("MBean that provides access to job stealing failover 
SPI configuration.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Maximum number of attempts to execute a failed 
job on another node.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Total number of jobs that were failed over 
including stolen ones.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Total number of jobs that were stolen.")
+    @MXBeanDescription("Total number of jobs that were stolen.")
     public int getTotalStolenJobsCount();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 30e3028..5d675fe 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}.
  */
-@IgniteMXBeanDescription("MBean that provides access to never failover SPI 
configuration.")
+@MXBeanDescription("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/c9b1dfb3/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 e954ba4..a933bf2 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.
  */
-@IgniteMXBeanDescription("MBean that provides access to adaptive load 
balancing SPI configuration.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Text description of current load probing 
implementation used.")
+    @MXBeanDescription("Text description of current load probing 
implementation used.")
     public String getLoadProbeFormatted();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 37e863f..6512c95 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.
  */
-@IgniteMXBeanDescription("MBean that provides access to round robin load 
balancing SPI configuration.")
+@MXBeanDescription("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}.
      */
-    @IgniteMXBeanDescription("Configuration parameter indicating whether a new 
round robin order should be created for every task.")
+    @MXBeanDescription("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/c9b1dfb3/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 5a65466..4bd912f 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.
  */
-@IgniteMXBeanDescription("MBean that provides access to weighted random load 
balancing SPI configuration.")
+@MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Whether node weights are considered when doing 
random load balancing.")
+    @MXBeanDescription("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.
      */
-    @IgniteMXBeanDescription("Weight of this node.")
+    @MXBeanDescription("Weight of this node.")
     public int getNodeWeight();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c9b1dfb3/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 3fe951d..abbfc2f 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}.
  */
-@IgniteMXBeanDescription("MBean that provides access to no-op secure session 
SPI configuration.")
+@MXBeanDescription("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/c9b1dfb3/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 8c1caeb..4c4623b 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}.
  */
-@IgniteMXBeanDescription("MBean that provides configuration information on 
file-based swapspace SPI.")
+@MXBeanDescription("MBean that provides configuration information on 
file-based swapspace SPI.")
 public interface FileSwapSpaceSpiMBean extends IgniteSpiManagementMBean {
     /**
      * Gets base directory.
      *
      * @return Base directory.
      */
-    @IgniteMXBeanDescription("Base directory.")
+    @MXBeanDescription("Base directory.")
     public String getBaseDirectory();
 
     /**
@@ -38,7 +38,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Maximum sparsity.
      */
-    @IgniteMXBeanDescription("Maximum sparsity.")
+    @MXBeanDescription("Maximum sparsity.")
     public float getMaximumSparsity();
 
     /**
@@ -46,7 +46,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Write buffer size in bytes.
      */
-    @IgniteMXBeanDescription("Write buffer size in bytes.")
+    @MXBeanDescription("Write buffer size in bytes.")
     public int getWriteBufferSize();
 
     /**
@@ -54,7 +54,7 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Max write queue size in bytes.
      */
-    @IgniteMXBeanDescription("Max write queue size in bytes.")
+    @MXBeanDescription("Max write queue size in bytes.")
     public int getMaxWriteQueueSize();
 
     /**
@@ -62,6 +62,6 @@ public interface FileSwapSpaceSpiMBean extends 
IgniteSpiManagementMBean {
      *
      * @return Read pool size.
      */
-    @IgniteMXBeanDescription("Read pool size.")
+    @MXBeanDescription("Read pool size.")
     public int getReadStripesNumber();
 }

Reply via email to