http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java
deleted file mode 100644
index 1ad7d78..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpiMXBean.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.spi.collision.priorityqueue;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean that provides access to the priority queue collision SPI 
configuration.
- */
-@IgniteMXBeanDescription("MXBean provides access to the priority queue 
collision SPI.")
-public interface PriorityQueueCollisionSpiMXBean extends 
IgniteSpiManagementMXBean {
-    /**
-     * 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.")
-    public int getCurrentWaitJobsNumber();
-
-    /**
-     * Gets current number of jobs that are active, i.e. {@code 'running + 
held'} jobs.
-     *
-     * @return Number of active jobs.
-     */
-    @IgniteMXBeanDescription("Number of active jobs.")
-    public int getCurrentActiveJobsNumber();
-
-    /*
-     * Gets number of currently running (not {@code 'held}) jobs.
-     *
-     * @return Number of currently running (not {@code 'held}) jobs.
-     */
-    @IgniteMXBeanDescription("Number of running jobs.")
-    public int getCurrentRunningJobsNumber();
-
-    /**
-     * Gets number of currently {@code 'held'} jobs.
-     *
-     * @return Number of currently {@code 'held'} jobs.
-     */
-    @IgniteMXBeanDescription("Number of held jobs.")
-    public int getCurrentHeldJobsNumber();
-
-    /**
-     * 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.")
-    public int getParallelJobsNumber();
-
-    /**
-     * Sets number of jobs that can be executed in parallel.
-     *
-     * @param num Parallel jobs number.
-     */
-    @IgniteMXBeanDescription("Number of jobs that can be executed in 
parallel.")
-    public void setParallelJobsNumber(int num);
-
-    /**
-     * Maximum number of jobs that are allowed to wait in waiting queue. If 
number
-     * of waiting jobs ever exceeds this number, excessive jobs will be 
rejected.
-     *
-     * @return Maximum allowed number of waiting jobs.
-     */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
-    public int getWaitingJobsNumber();
-
-    /**
-     * Maximum number of jobs that are allowed to wait in waiting queue. If 
number
-     * of waiting jobs ever exceeds this number, excessive jobs will be 
rejected.
-     *
-     * @param num Maximium jobs number.
-     */
-    @IgniteMXBeanDescription("Maximum allowed number of waiting jobs.")
-    public void setWaitingJobsNumber(int num);
-
-    /**
-     * Gets key name of task priority attribute.
-     *
-     * @return Key name of task priority attribute.
-     */
-    @IgniteMXBeanDescription("Key name of task priority attribute.")
-    public String getPriorityAttributeKey();
-
-    /**
-     * Gets key name of job priority attribute.
-     *
-     * @return Key name of job priority attribute.
-     */
-    @IgniteMXBeanDescription("Key name of job priority attribute.")
-    public String getJobPriorityAttributeKey();
-
-    /**
-     * Gets default priority to use if a job does not have priority attribute
-     * set.
-     *
-     * @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.")
-    public int getDefaultPriority();
-
-    /**
-     * Sets default priority to use if a job does not have priority attribute 
set.
-     *
-     * @param priority default priority.
-     */
-    @IgniteMXBeanDescription("Default priority to use if a task does not have 
priority attribute set.")
-    public void setDefaultPriority(int priority);
-
-    /**
-     * Gets value to increment job priority by every time a lower priority job 
gets
-     * behind a higher priority job.
-     *
-     * @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.")
-    public int getStarvationIncrement();
-
-    /**
-     * Sets value to increment job priority by every time a lower priority job 
gets
-     * behind a higher priority job.
-     *
-     * @param increment Increment value.
-     */
-    @IgniteMXBeanDescription("Value to increment job priority by every time a 
lower priority job gets behind a higher priority job.")
-    public void setStarvationIncrement(int increment);
-
-    /**
-     * Gets flag indicating whether job starvation prevention is enabled.
-     *
-     * @return Flag indicating whether job starvation prevention is enabled.
-     */
-    @IgniteMXBeanDescription("Flag indicating whether job starvation 
prevention is enabled.")
-    public boolean isStarvationPreventionEnabled();
-
-    /**
-     * Sets flag indicating whether job starvation prevention is enabled.
-     *
-     * @param preventStarvation 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/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index e81096a..21a6aab 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -23,6 +23,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMXBean.java
deleted file mode 100644
index 0449370..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMXBean.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * 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.spi.communication.tcp;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * MBean provide access to TCP-based communication SPI.
- */
-@IgniteMXBeanDescription("MXBean provide access to TCP-based communication 
SPI.")
-public interface TcpCommunicationSpiMXBean extends IgniteSpiManagementMXBean {
-    /**
-     * Gets local host address for socket binding.
-     * Beside loopback address physical node could have
-     * several other ones, but only one is assigned to grid node.
-     *
-     * @return Grid node IP address.
-     */
-    @IgniteMXBeanDescription("Grid node IP address.")
-    public String getLocalAddress();
-
-    /**
-     * Gets local port for socket binding.
-     *
-     * @return Port number.
-     */
-    @IgniteMXBeanDescription("Port number.")
-    public int getLocalPort();
-
-    /**
-     * Gets local port for shared memory communication.
-     *
-     * @return Port number.
-     */
-    @IgniteMXBeanDescription("Shared memory endpoint port number.")
-    public int getSharedMemoryPort();
-
-    /**
-     * Gets maximum number of local ports tried if all previously
-     * tried ports are occupied.
-     *
-     * @return Local port range.
-     */
-    @IgniteMXBeanDescription("Local port range.")
-    public int getLocalPortRange();
-
-    /**
-     * Gets maximum idle connection time upon which idle connections
-     * will be closed.
-     *
-     * @return Maximum idle connection time.
-     */
-    @IgniteMXBeanDescription("Maximum idle connection time.")
-    public long getIdleConnectionTimeout();
-
-    /**
-     * Gets flag that indicates whether direct or heap allocated buffer is 
used.
-     *
-     * @return 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();
-
-    /**
-     * Gets count of selectors used in TCP server. Default value equals to the
-     * number of CPUs available in the system.
-     *
-     * @return Count of selectors in TCP server.
-     */
-    @IgniteMXBeanDescription("Count of selectors used in TCP server.")
-    public int getSelectorsCount();
-
-    /**
-     * Gets sent messages count.
-     *
-     * @return Sent messages count.
-     */
-    @IgniteMXBeanDescription("Sent messages count.")
-    public int getSentMessagesCount();
-
-    /**
-     * Gets sent bytes count.
-     *
-     * @return Sent bytes count.
-     */
-    @IgniteMXBeanDescription("Sent bytes count.")
-    public long getSentBytesCount();
-
-    /**
-     * Gets received messages count.
-     *
-     * @return Received messages count.
-     */
-    @IgniteMXBeanDescription("Received messages count.")
-    public int getReceivedMessagesCount();
-
-    /**
-     * Gets received bytes count.
-     *
-     * @return Received bytes count.
-     */
-    @IgniteMXBeanDescription("Received bytes count.")
-    public long getReceivedBytesCount();
-
-    /**
-     * Gets outbound messages queue size.
-     *
-     * @return Outbound messages queue size.
-     */
-    @IgniteMXBeanDescription("Outbound messages queue size.")
-    public int getOutboundMessagesQueueSize();
-
-    /**
-     * Gets connect timeout used when establishing connection
-     * with remote nodes.
-     *
-     * @return Connect timeout.
-     */
-    @IgniteMXBeanDescription("Connect timeout.")
-    public long getConnectTimeout();
-
-    /**
-     * Gets maximum connect timeout.
-     *
-     * @return Maximum connect timeout.
-     */
-    @IgniteMXBeanDescription("Maximum connect timeout.")
-    public long getMaxConnectTimeout();
-
-    /**
-     * Gets maximum number of reconnect attempts used when establishing 
connection
-     * with remote nodes.
-     *
-     * @return Reconnects count.
-     */
-    @IgniteMXBeanDescription("Reconnect count on connection failure.")
-    public int getReconnectCount();
-
-    /**
-     * Gets value for {@code TCP_NODELAY} socket option.
-     *
-     * @return {@code True} if TCP delay is disabled.
-     */
-    @IgniteMXBeanDescription("TCP_NODELAY socket option value.")
-    public boolean isTcpNoDelay();
-
-    /**
-     * Gets connection buffer flush frequency.
-     * <p>
-     * Client connections to other nodes in topology use buffered output.
-     * This frequency defines how often system will advice to flush
-     * connection buffer.
-     *
-     * @return Flush frequency.
-     */
-    @IgniteMXBeanDescription("Connection buffer flush frequency.")
-    public long getConnectionBufferFlushFrequency();
-
-    /**
-     * Sets connection buffer flush frequency.
-     * <p>
-     * Client connections to other nodes in topology use buffered output.
-     * This frequency defines how often system will advice to flush
-     * connection buffer.
-     * <p>
-     * If not provided, default value is {@link 
TcpCommunicationSpi#DFLT_CONN_BUF_FLUSH_FREQ}.
-     * <p>
-     * This property is used only if {@link #getConnectionBufferSize()} is 
greater than {@code 0}.
-     *
-     * @param connBufFlushFreq Flush frequency.
-     * @see #getConnectionBufferSize()
-     */
-    @IgniteMXBeanDescription("Sets connection buffer flush frequency.")
-    public void setConnectionBufferFlushFrequency(long connBufFlushFreq);
-
-    /**
-     * Gets connection buffer size.
-     * <p>
-     * If set to {@code 0} connection buffer is disabled.
-     *
-     * @return Connection buffer size.
-     */
-    @IgniteMXBeanDescription("Connection buffer size.")
-    public int getConnectionBufferSize();
-
-    /**
-     * Gets flag defining whether direct send buffer should be used.
-     *
-     * @return {@code True} if direct buffers should be used.
-     */
-    @IgniteMXBeanDescription("Direct send buffer.")
-    public boolean isDirectSendBuffer();
-
-    /**
-     * Gets receive buffer size for sockets created or accepted by this SPI.
-     * <p>
-     * If not provided, default is {@link 
TcpCommunicationSpi#DFLT_SOCK_BUF_SIZE}.
-     *
-     * @return Socket receive buffer size.
-     */
-    @IgniteMXBeanDescription("Socket receive buffer.")
-    public int getSocketReceiveBuffer();
-
-    /**
-     * Gets send buffer size for sockets created or accepted by this SPI.
-     * <p>
-     * If not provided, default is {@link 
TcpCommunicationSpi#DFLT_SOCK_BUF_SIZE}.
-     *
-     * @return Socket send buffer size.
-     */
-    @IgniteMXBeanDescription("Socket send buffer.")
-    public int getSocketSendBuffer();
-
-    /**
-     * Gets message queue limit for incoming and outgoing messages.
-     *
-     * @return Send queue size limit.
-     */
-    @IgniteMXBeanDescription("Message queue size limit.")
-    public int getMessageQueueLimit();
-
-    /**
-     * Gets the minimum number of messages for this SPI, that are buffered
-     * prior to sending.
-     *
-     * @return Minimum buffered message count.
-     */
-    @IgniteMXBeanDescription("Minimum buffered message count.")
-    public int getMinimumBufferedMessageCount();
-
-    /**
-     * Gets the buffer size ratio for this SPI. As messages are sent,
-     * the buffer size is adjusted using this ratio.
-     *
-     * @return Buffer size ratio.
-     */
-    @IgniteMXBeanDescription("Buffer size ratio.")
-    public double getBufferSizeRatio();
-
-    /**
-     * Gets socket write timeout for TCP connections. If message can not be 
written to
-     * socket within this time then connection is closed and reconnect is 
attempted.
-     *
-     * @return Socket write timeout for TCP connections.
-     */
-    @IgniteMXBeanDescription("Socket write timeout.")
-    public long getSocketWriteTimeout();
-
-    /**
-     * Gets number of received messages per connection to node after which 
acknowledgment message is sent.
-     *
-     * @return Number of received messages after which acknowledgment is sent.
-     */
-    @IgniteMXBeanDescription("Number of received messages after which 
acknowledgment is sent.")
-    public int getAckSendThreshold();
-
-    /**
-     * Gets maximum number of stored unacknowledged messages per connection to 
node.
-     * If number of unacknowledged messages exceeds this number then 
connection to node is
-     * closed and reconnect is attempted.
-     *
-     * @return 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/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
index 7895f7c..2595834 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
@@ -20,6 +20,7 @@ package org.apache.ignite.spi.deployment.local;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.util.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.deployment.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMXBean.java
deleted file mode 100644
index cd186b0..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpiMXBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.spi.deployment.local;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management MXBean for {@link LocalDeploymentSpi} SPI.
- */
-@IgniteMXBeanDescription("MXBean that provides access to local deployment SPI 
configuration.")
-public interface LocalDeploymentSpiMXBean extends IgniteSpiManagementMXBean {
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 31ee607..c51f4f4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.discovery.tcp.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMXBean.java
deleted file mode 100644
index 2fe2525..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMXBean.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.spi.discovery.tcp;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-import java.util.*;
-
-/**
- * Management bean for {@link TcpClientDiscoverySpi}.
- */
-public interface TcpClientDiscoverySpiMXBean extends IgniteSpiManagementMXBean 
{
-    /**
-     * Gets disconnect check interval.
-     *
-     * @return Disconnect check interval.
-     */
-    @IgniteMXBeanDescription("Disconnect check interval.")
-    public long getDisconnectCheckInterval();
-
-    /**
-     * Gets socket timeout.
-     *
-     * @return Socket timeout.
-     */
-    @IgniteMXBeanDescription("Socket timeout.")
-    public long getSocketTimeout();
-
-    /**
-     * Gets message acknowledgement timeout.
-     *
-     * @return Message acknowledgement timeout.
-     */
-    @IgniteMXBeanDescription("Message acknowledgement timeout.")
-    public long getAckTimeout();
-
-    /**
-     * Gets network timeout.
-     *
-     * @return Network timeout.
-     */
-    @IgniteMXBeanDescription("Network timeout.")
-    public long getNetworkTimeout();
-
-    /**
-     * Gets thread priority. All threads within SPI will be started with it.
-     *
-     * @return Thread priority.
-     */
-    @IgniteMXBeanDescription("Threads priority.")
-    public int getThreadPriority();
-
-    /**
-     * Gets delay between heartbeat messages sent by coordinator.
-     *
-     * @return Time period in milliseconds.
-     */
-    @IgniteMXBeanDescription("Heartbeat frequency.")
-    public long getHeartbeatFrequency();
-
-    /**
-     * Gets {@link 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} (string 
representation).
-     *
-     * @return IPFinder (string representation).
-     */
-    @IgniteMXBeanDescription("IP Finder.")
-    public String getIpFinderFormatted();
-
-    /**
-     * Gets message worker queue current size.
-     *
-     * @return Message worker queue current size.
-     */
-    @IgniteMXBeanDescription("Message worker queue current size.")
-    public int getMessageWorkerQueueSize();
-
-    /**
-     * Gets joined nodes count.
-     *
-     * @return Nodes joined count.
-     */
-    @IgniteMXBeanDescription("Nodes joined count.")
-    public long getNodesJoined();
-
-    /**
-     * Gets left nodes count.
-     *
-     * @return Left nodes count.
-     */
-    @IgniteMXBeanDescription("Nodes left count.")
-    public long getNodesLeft();
-
-    /**
-     * Gets failed nodes count.
-     *
-     * @return Failed nodes count.
-     */
-    @IgniteMXBeanDescription("Nodes failed count.")
-    public long getNodesFailed();
-
-    /**
-     * Gets avg message processing time.
-     *
-     * @return Avg message processing time.
-     */
-    @IgniteMXBeanDescription("Avg message processing time.")
-    public long getAvgMessageProcessingTime();
-
-    /**
-     * Gets max message processing time.
-     *
-     * @return Max message processing time.
-     */
-    @IgniteMXBeanDescription("Max message processing time.")
-    public long getMaxMessageProcessingTime();
-
-    /**
-     * Gets total received messages count.
-     *
-     * @return Total received messages count.
-     */
-    @IgniteMXBeanDescription("Total received messages count.")
-    public int getTotalReceivedMessages();
-
-    /**
-     * Gets received messages counts (grouped by type).
-     *
-     * @return Map containing message types and respective counts.
-     */
-    @IgniteMXBeanDescription("Received messages by type.")
-    public Map<String, Integer> getReceivedMessages();
-
-    /**
-     * Gets total processed messages count.
-     *
-     * @return Total processed messages count.
-     */
-    @IgniteMXBeanDescription("Total processed messages count.")
-    public int getTotalProcessedMessages();
-
-    /**
-     * Gets processed messages counts (grouped by type).
-     *
-     * @return Map containing message types and respective counts.
-     */
-    @IgniteMXBeanDescription("Received messages by type.")
-    public Map<String, Integer> getProcessedMessages();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index ecf209b..013933e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -23,6 +23,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMXBean.java
deleted file mode 100644
index 946521e..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMXBean.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * 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.spi.discovery.tcp;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Management bean for {@link TcpDiscoverySpi}.
- */
-public interface TcpDiscoverySpiMXBean extends IgniteSpiManagementMXBean {
-    /**
-     * Gets delay between heartbeat messages sent by coordinator.
-     *
-     * @return Time period in milliseconds.
-     */
-    @IgniteMXBeanDescription("Heartbeat frequency.")
-    public long getHeartbeatFrequency();
-
-    /**
-     * Gets current SPI state.
-     *
-     * @return Current SPI state.
-     */
-    @IgniteMXBeanDescription("SPI state.")
-    public String getSpiState();
-
-    /**
-     * Gets {@link 
org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} (string 
representation).
-     *
-     * @return IPFinder (string representation).
-     */
-    @IgniteMXBeanDescription("IP Finder.")
-    public String getIpFinderFormatted();
-
-    /**
-     * Gets number of connection attempts.
-     *
-     * @return Number of connection attempts.
-     */
-    @IgniteMXBeanDescription("Reconnect count.")
-    public int getReconnectCount();
-
-    /**
-     * Gets network timeout.
-     *
-     * @return Network timeout.
-     */
-    @IgniteMXBeanDescription("Network timeout.")
-    public long getNetworkTimeout();
-
-    /**
-     * Gets local TCP port SPI listens to.
-     *
-     * @return Local port range.
-     */
-    @IgniteMXBeanDescription("Local TCP port.")
-    public int getLocalPort();
-
-    /**
-     * Gets local TCP port range.
-     *
-     * @return Local port range.
-     */
-    @IgniteMXBeanDescription("Local TCP port range.")
-    public int getLocalPortRange();
-
-    /**
-     * Gets max heartbeats count node can miss without initiating status check.
-     *
-     * @return Max missed heartbeats.
-     */
-    @IgniteMXBeanDescription("Max missed heartbeats.")
-    public int getMaxMissedHeartbeats();
-
-    /**
-     * Gets max heartbeats count node can miss without failing client node.
-     *
-     * @return Max missed client heartbeats.
-     */
-    @IgniteMXBeanDescription("Max missed client heartbeats.")
-    public int getMaxMissedClientHeartbeats();
-
-    /**
-     * Gets thread priority. All threads within SPI will be started with it.
-     *
-     * @return Thread priority.
-     */
-    @IgniteMXBeanDescription("Threads priority.")
-    public int getThreadPriority();
-
-    /**
-     * Gets IP finder clean frequency.
-     *
-     * @return IP finder clean frequency.
-     */
-    @IgniteMXBeanDescription("IP finder clean frequency.")
-    public long getIpFinderCleanFrequency();
-
-    /**
-     * Gets statistics print frequency.
-     *
-     * @return Statistics print frequency in milliseconds.
-     */
-    @IgniteMXBeanDescription("Statistics print frequency.")
-    public long getStatisticsPrintFrequency();
-
-    /**
-     * Gets message worker queue current size.
-     *
-     * @return Message worker queue current size.
-     */
-    @IgniteMXBeanDescription("Message worker queue current size.")
-    public int getMessageWorkerQueueSize();
-
-    /**
-     * Gets joined nodes count.
-     *
-     * @return Nodes joined count.
-     */
-    @IgniteMXBeanDescription("Nodes joined count.")
-    public long getNodesJoined();
-
-    /**
-     * Gets left nodes count.
-     *
-     * @return Left nodes count.
-     */
-    @IgniteMXBeanDescription("Nodes left count.")
-    public long getNodesLeft();
-
-    /**
-     * Gets failed nodes count.
-     *
-     * @return Failed nodes count.
-     */
-    @IgniteMXBeanDescription("Nodes failed count.")
-    public long getNodesFailed();
-
-    /**
-     * Gets pending messages registered count.
-     *
-     * @return Pending messages registered count.
-     */
-    @IgniteMXBeanDescription("Pending messages registered.")
-    public long getPendingMessagesRegistered();
-
-    /**
-     * Gets pending messages discarded count.
-     *
-     * @return Pending messages registered count.
-     */
-    @IgniteMXBeanDescription("Pending messages discarded.")
-    public long getPendingMessagesDiscarded();
-
-    /**
-     * Gets avg message processing time.
-     *
-     * @return Avg message processing time.
-     */
-    @IgniteMXBeanDescription("Avg message processing time.")
-    public long getAvgMessageProcessingTime();
-
-    /**
-     * Gets max message processing time.
-     *
-     * @return Max message processing time.
-     */
-    @IgniteMXBeanDescription("Max message processing time.")
-    public long getMaxMessageProcessingTime();
-
-    /**
-     * Gets total received messages count.
-     *
-     * @return Total received messages count.
-     */
-    @IgniteMXBeanDescription("Total received messages count.")
-    public int getTotalReceivedMessages();
-
-    /**
-     * Gets received messages counts (grouped by type).
-     *
-     * @return Map containing message types and respective counts.
-     */
-    @IgniteMXBeanDescription("Received messages by type.")
-    public Map<String, Integer> getReceivedMessages();
-
-    /**
-     * Gets total processed messages count.
-     *
-     * @return Total processed messages count.
-     */
-    @IgniteMXBeanDescription("Total processed messages count.")
-    public int getTotalProcessedMessages();
-
-    /**
-     * Gets processed messages counts (grouped by type).
-     *
-     * @return Map containing message types and respective counts.
-     */
-    @IgniteMXBeanDescription("Received messages by type.")
-    public Map<String, Integer> getProcessedMessages();
-
-    /**
-     * Gets time local node has been coordinator since.
-     *
-     * @return Time local node is coordinator since.
-     */
-    @IgniteMXBeanDescription("Local node is coordinator since.")
-    public long getCoordinatorSinceTimestamp();
-
-    /**
-     * Gets current coordinator.
-     *
-     * @return Gets current coordinator.
-     */
-    @IgniteMXBeanDescription("Coordinator node ID.")
-    @Nullable public UUID getCoordinator();
-
-    /**
-     * Gets message acknowledgement timeout.
-     *
-     * @return Message acknowledgement timeout.
-     */
-    @IgniteMXBeanDescription("Message acknowledgement timeout.")
-    public long getAckTimeout();
-
-    /**
-     * Gets maximum message acknowledgement timeout.
-     *
-     * @return Maximum message acknowledgement timeout.
-     */
-    @IgniteMXBeanDescription("Maximum message acknowledgement timeout.")
-    public long getMaxAckTimeout();
-
-    /**
-     * Gets socket timeout.
-     *
-     * @return Socket timeout.
-     */
-    @IgniteMXBeanDescription("Socket timeout.")
-    public long getSocketTimeout();
-
-    /**
-     * Gets join timeout.
-     *
-     * @return Join timeout.
-     */
-    @IgniteMXBeanDescription("Join timeout.")
-    public long getJoinTimeout();
-
-    /**
-     * Dumps debug info using configured logger.
-     */
-    @IgniteMXBeanDescription("Dump debug info.")
-    public void dumpDebugInfo();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
index 7726633..3fa7f91 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
@@ -20,6 +20,7 @@ package org.apache.ignite.spi.eventstorage.memory;
 import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.eventstorage.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMXBean.java
deleted file mode 100644
index bf14670..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpiMXBean.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.spi.eventstorage.memory;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link MemoryEventStorageSpi}.
- * Beside properties defined for every SPI bean this one gives access to:
- * <ul>
- * <li>Event expiration time (see {@link #getExpireAgeMs()})</li>
- * <li>Maximum queue size (see {@link #getExpireCount()})</li>
- * <li>Method that removes all items from queue (see {@link #clearAll()})</li>
- * </ul>
- */
-@IgniteMXBeanDescription("MXBean that provides access to memory event storage 
SPI configuration.")
-public interface MemoryEventStorageSpiMXBean extends IgniteSpiManagementMXBean 
{
-    /**
-     * Gets event time-to-live value. Implementation must guarantee
-     * that event would not be accessible if its lifetime exceeds this value.
-     *
-     * @return Event time-to-live.
-     */
-    @IgniteMXBeanDescription("Event time-to-live value.")
-    public long getExpireAgeMs();
-
-    /**
-     * Gets maximum event queue size. New incoming events will oust
-     * oldest ones if queue size exceeds this limit.
-     *
-     * @return Maximum event queue size.
-     */
-    @IgniteMXBeanDescription("Maximum event queue size.")
-    public long getExpireCount();
-
-    /**
-     * Gets current queue size of the event queue.
-     *
-     * @return Current queue size of the event queue.
-     */
-    @IgniteMXBeanDescription("Current event queue size.")
-    public long getQueueSize();
-
-    /**
-     * 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/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
index 3dc122b..e3719c9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.failover.always;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.failover.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMXBean.java
deleted file mode 100644
index cb98c29..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpiMXBean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.spi.failover.always;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link AlwaysFailoverSpi}.
- */
-@IgniteMXBeanDescription("MXBean that provides access to always failover SPI 
configuration.")
-public interface AlwaysFailoverSpiMXBean extends IgniteSpiManagementMXBean {
-    /**
-     * Gets maximum number of attempts to execute a failed job on another node.
-     * If not specified, {@link AlwaysFailoverSpi#DFLT_MAX_FAILOVER_ATTEMPTS} 
value will be used.
-     *
-     * @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.")
-    public int getMaximumFailoverAttempts();
-
-    /**
-     * Get total number of jobs that were failed over.
-     *
-     * @return Total number of failed over jobs.
-     */
-    @IgniteMXBeanDescription("Total number of jobs that were failed over.")
-    public int getTotalFailoverJobsCount();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
index d433493..f744de2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.failover.jobstealing;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.failover.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMXBean.java
deleted file mode 100644
index 1a173db..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpiMXBean.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.spi.failover.jobstealing;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link JobStealingFailoverSpi}.
- */
-@IgniteMXBeanDescription("MXBean that provides access to job stealing failover 
SPI configuration.")
-public interface JobStealingFailoverSpiMXBean extends 
IgniteSpiManagementMXBean {
-    /**
-     * Gets maximum number of attempts to execute a failed job on another node.
-     * If job gets stolen and thief node exists then it is not considered as
-     * failed job.
-     * If not specified, {@link 
JobStealingFailoverSpi#DFLT_MAX_FAILOVER_ATTEMPTS} value will be used.
-     *
-     * @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.")
-    public int getMaximumFailoverAttempts();
-
-    /**
-     * Get total number of jobs that were failed over including stolen ones.
-     *
-     * @return Total number of failed over jobs.
-     */
-    @IgniteMXBeanDescription("Total number of jobs that were failed over 
including stolen ones.")
-    public int getTotalFailedOverJobsCount();
-
-    /**
-     * Get total number of jobs that were stolen.
-     *
-     * @return Total number of stolen jobs.
-     */
-    @IgniteMXBeanDescription("Total number of jobs that were stolen.")
-    public int getTotalStolenJobsCount();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
index cd5a4fa..9065f04 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.failover.never;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.failover.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMXBean.java
deleted file mode 100644
index 3f9945f..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpiMXBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.spi.failover.never;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link NeverFailoverSpi}.
- */
-@IgniteMXBeanDescription("MXBean that provides access to never failover SPI 
configuration.")
-public interface NeverFailoverSpiMXBean extends IgniteSpiManagementMXBean {
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index fc4b4c7..fbbd093 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.eventstorage.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMXBean.java
deleted file mode 100644
index dfb459a..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpiMXBean.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.spi.loadbalancing.adaptive;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management MBean for {@link AdaptiveLoadBalancingSpi} SPI.
- */
-@IgniteMXBeanDescription("MXBean that provides access to adaptive load 
balancing SPI configuration.")
-public interface AdaptiveLoadBalancingSpiMXBean extends 
IgniteSpiManagementMXBean {
-    /**
-     * 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.")
-    public String getLoadProbeFormatted();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
index 9352a62..ca708c8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.eventstorage.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMXBean.java
deleted file mode 100644
index 9db8da6..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpiMXBean.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.spi.loadbalancing.roundrobin;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link RoundRobinLoadBalancingSpi} SPI.
- */
-@IgniteMXBeanDescription("MXBean that provides access to round robin load 
balancing SPI configuration.")
-public interface RoundRobinLoadBalancingSpiMXBean extends 
IgniteSpiManagementMXBean {
-    /**
-     * Configuration parameter indicating whether a new round robin order 
should be
-     * created for every task. If {@code true} then load balancer is guaranteed
-     * to iterate through nodes sequentially for every task - so as long as 
number
-     * of jobs is less than or equal to the number of nodes, jobs are 
guaranteed to
-     * be assigned to unique nodes. If {@code false} then one round-robin order
-     * will be maintained for all tasks, so when tasks execute concurrently, it
-     * is possible for more than one job within task to be assigned to the same
-     * node.
-     * <p>
-     * Default is {@code true}.
-     *
-     * @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.")
-    public boolean isPerTask();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
index c4a83bc..4facf12 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.eventstorage.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMXBean.java
deleted file mode 100644
index 7cf56ef..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpiMXBean.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.spi.loadbalancing.weightedrandom;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management MBean for {@link WeightedRandomLoadBalancingSpi} SPI.
- */
-@IgniteMXBeanDescription("MXBean that provides access to weighted random load 
balancing SPI configuration.")
-public interface WeightedRandomLoadBalancingSpiMXBean extends 
IgniteSpiManagementMXBean {
-    /**
-     * Checks whether node weights are considered when doing
-     * random load balancing.
-     *
-     * @return If {@code true} then random load is distributed according
-     *      to node weights.
-     */
-    @IgniteMXBeanDescription("Whether node weights are considered when doing 
random load balancing.")
-    public boolean isUseWeights();
-
-    /**
-     * Gets weight of this node.
-     *
-     * @return Weight of this node.
-     */
-    @IgniteMXBeanDescription("Weight of this node.")
-    public int getNodeWeight();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
index 8550e89..ff1974c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.spi.securesession.noop;
 
 import org.apache.ignite.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.plugin.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMXBean.java
deleted file mode 100644
index 2da758e..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMXBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.spi.securesession.noop;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link NoopSecureSessionSpi}.
- */
-@IgniteMXBeanDescription("MXBean that provides access to no-op secure session 
SPI configuration.")
-public interface NoopSecureSessionSpiMXBean extends IgniteSpiManagementMXBean {
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
index 53cd050..cf8c9b5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
@@ -20,6 +20,7 @@ package org.apache.ignite.spi.swapspace.file;
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.swapspace.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMXBean.java
deleted file mode 100644
index 4fdaa16..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpiMXBean.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.spi.swapspace.file;
-
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
-
-/**
- * Management bean for {@link FileSwapSpaceSpi}.
- */
-@IgniteMXBeanDescription("MXBean that provides configuration information on 
file-based swapspace SPI.")
-public interface FileSwapSpaceSpiMXBean extends IgniteSpiManagementMXBean {
-    /**
-     * Gets base directory.
-     *
-     * @return Base directory.
-     */
-    @IgniteMXBeanDescription("Base directory.")
-    public String getBaseDirectory();
-
-    /**
-     * Gets maximum sparsity.
-     *
-     * @return Maximum sparsity.
-     */
-    @IgniteMXBeanDescription("Maximum sparsity.")
-    public float getMaximumSparsity();
-
-    /**
-     * Gets write buffer size in bytes.
-     *
-     * @return Write buffer size in bytes.
-     */
-    @IgniteMXBeanDescription("Write buffer size in bytes.")
-    public int getWriteBufferSize();
-
-    /**
-     * Gets max write queue size in bytes.
-     *
-     * @return Max write queue size in bytes.
-     */
-    @IgniteMXBeanDescription("Max write queue size in bytes.")
-    public int getMaxWriteQueueSize();
-
-    /**
-     * Gets read pool size.
-     *
-     * @return Read pool size.
-     */
-    @IgniteMXBeanDescription("Read pool size.")
-    public int getReadStripesNumber();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMXBean.java 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMXBean.java
deleted file mode 100644
index 6055a6b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMXBean.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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.streamer;
-
-import org.apache.ignite.mxbean.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Streamer MBean interface.
- */
-@IgniteMXBeanDescription("MXBean that provides access to streamer description 
and metrics.")
-public interface StreamerMXBean {
-    /**
-     * Gets streamer name.
-     *
-     * @return Streamer name.
-     */
-    @IgniteMXBeanDescription("Streamer name.")
-    @Nullable public String getName();
-
-    /**
-     * Gets {@code atLeastOnce} configuration flag.
-     *
-     * @return {@code True} if {@code atLeastOnce} is configured.
-     */
-    @IgniteMXBeanDescription("True if atLeastOnce is configured.")
-    public boolean isAtLeastOnce();
-
-    /**
-     * Gets size of stage futures map. This map is maintained only when {@code 
atLeastOnce} configuration
-     * flag is set to true.
-     *
-     * @return Stage future map size.
-     */
-    @IgniteMXBeanDescription("Stage future map size.")
-    public int getStageFutureMapSize();
-
-    /**
-     * Gets size of batch futures map.
-     *
-     * @return Batch future map size.
-     */
-    @IgniteMXBeanDescription("Batch future map size.")
-    public int getBatchFutureMapSize();
-
-    /**
-     * Gets number of stages currently being executed in streamer pool.
-     *
-     * @return Number of stages. Cannot be more than pool thread count.
-     */
-    @IgniteMXBeanDescription("Number of stages currently being executed in 
streamer pool.")
-    public int getStageActiveExecutionCount();
-
-    /**
-     * Gets number of event batches currently waiting to be executed.
-     *
-     * @return Number of event batches waiting to be processed.
-     */
-    @IgniteMXBeanDescription("Number of event batches currently waiting to be 
executed.")
-    public int getStageWaitingExecutionCount();
-
-    /**
-     * Gets total number of stages executed since last reset.
-     *
-     * @return Total number of stages executed since last reset.
-     */
-    @IgniteMXBeanDescription("Total number of stages executed since last 
reset.")
-    public long getStageTotalExecutionCount();
-
-    /**
-     * Gets pipeline maximum execution time, i.e. time between execution start 
and time when last stage in pipeline
-     * returned empty map. If pipeline execution was split to different nodes, 
metrics for each split will be
-     * recorded independently.
-     *
-     * @return Pipeline maximum execution time.
-     */
-    @IgniteMXBeanDescription("Pipeline maximum execution time.")
-    public long getPipelineMaximumExecutionTime();
-
-    /**
-     * Gets pipeline minimum execution time, i.e. time between execution start 
and time when last stage in pipeline
-     * returned empty map. If pipeline execution was split to different nodes, 
metrics for each split will be
-     * recorded independently.
-     *
-     * @return Pipeline minimum execution time.
-     */
-    @IgniteMXBeanDescription("Pipeline minimum execution time.")
-    public long getPipelineMinimumExecutionTime();
-
-    /**
-     * Gets pipeline average execution time, i.e. time between execution start 
and time when last stage in pipeline
-     * returned empty map. If pipeline execution was split, metrics for each 
split will be recorded independently.
-     *
-     * @return Pipeline average execution time.
-     */
-    @IgniteMXBeanDescription("Pipeline average execution time.")
-    public long getPipelineAverageExecutionTime();
-
-    /**
-     * Gets maximum number of unique nodes participated in pipeline execution. 
If pipeline execution was split,
-     * metrics for each split will be recorded independently.
-     *
-     * @return Maximum number of unique nodes in pipeline execution.
-     */
-    @IgniteMXBeanDescription("Maximum number of unique nodes participated in 
pipeline execution.")
-    public int getPipelineMaximumExecutionNodes();
-
-    /**
-     * Gets minimum number of unique nodes participated in pipeline execution. 
If pipeline execution was split,
-     * metrics for each split will be recorded independently.
-     *
-     * @return Minimum number of unique nodes in pipeline execution.
-     */
-    @IgniteMXBeanDescription("Minimum number of unique nodes participated in 
pipeline execution.")
-    public int getPipelineMinimumExecutionNodes();
-
-    /**
-     * Gets average number of unique nodes participated in pipeline execution. 
If pipeline execution was split,
-     * metrics for each split will be recorded independently.
-     *
-     * @return Average number of unique nodes in pipeline execution.
-     */
-    @IgniteMXBeanDescription("Average number of unique nodes participated in 
pipeline execution.")
-    public int getPipelineAverageExecutionNodes();
-
-    /**
-     * Gets number of current active sessions. Since event execution sessions 
are tracked only when
-     * {@code atLeastOnce} configuration property is set to {@code true}, this 
metric will be collected
-     * only in this case. When {@code atLeastOnce} is set to {@code false}, 
this metric will always be zero.
-     *
-     * @return Number of current active sessions.
-     */
-    @IgniteMXBeanDescription("Number of current active sessions.")
-    public int getCurrentActiveSessions();
-
-    /**
-     * Gets maximum number of active sessions since last reset. Since event 
execution sessions are tracked only when
-     * {@code atLeastOnce} configuration property is set to {@code true}, this 
metric will be collected
-     * only in this case. When {@code atLeastOnce} is set to {@code false}, 
this metric will always be zero.
-     *
-     * @return Maximum active sessions since last reset.
-     */
-    @IgniteMXBeanDescription("Maximum number of active sessions since last 
reset.")
-    public int getMaximumActiveSessions();
-
-    /**
-     * Gets number of failures since last reset. If {@code atLeastOnce} flag 
is set to steamer configuration,
-     * then only root node failures will be counted. Otherwise each node will 
count failures independently.
-     *
-     * @return Failures count.
-     */
-    @IgniteMXBeanDescription("Number of failures since last reset.")
-    public int getFailuresCount();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMXBean.java
deleted file mode 100644
index b501caa..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMXBean.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.streamer;
-
-import org.apache.ignite.mxbean.*;
-
-/**
- * Streamer stage MBean.
- */
-@IgniteMXBeanDescription("MXBean that provides access to streamer stage 
description and metrics.")
-public interface StreamerStageMXBean {
-    /**
-     * Gets stage name.
-     *
-     * @return Stage name.
-     */
-    @IgniteMXBeanDescription("Stage name.")
-    public String getName();
-
-    /**
-     * Gets stage class name.
-     *
-     * @return Stage class name.
-     */
-    @IgniteMXBeanDescription("Stage class name.")
-    public String getStageClassName();
-
-    /**
-     * Gets stage minimum execution time.
-     *
-     * @return Stage minimum execution time.
-     */
-    @IgniteMXBeanDescription("Stage minimum execution time.")
-    public long getMinimumExecutionTime();
-
-    /**
-     * Gets stage maximum execution time.
-     *
-     * @return Stage maximum execution time.
-     */
-    @IgniteMXBeanDescription("Stage maximum execution time.")
-    public long getMaximumExecutionTime();
-
-    /**
-     * Gets stage average execution time.
-     *
-     * @return Stage average execution time.
-     */
-    @IgniteMXBeanDescription("Stage average execution time.")
-    public long getAverageExecutionTime();
-
-    /**
-     * Gets stage minimum waiting time.
-     *
-     * @return Stage minimum waiting time.
-     */
-    @IgniteMXBeanDescription("Stage minimum waiting time.")
-    public long getMinimumWaitingTime();
-
-    /**
-     * Gets stage maximum waiting time.
-     *
-     * @return Stage maximum waiting time.
-     */
-    @IgniteMXBeanDescription("Stage maximum waiting time.")
-    public long getMaximumWaitingTime();
-
-    /**
-     * Stage average waiting time.
-     *
-     * @return Stage average waiting time.
-     */
-    @IgniteMXBeanDescription("Stage average waiting time.")
-    public long getAverageWaitingTime();
-
-    /**
-     * Gets total stage execution count since last reset.
-     *
-     * @return Number of times this stage was executed.
-     */
-    @IgniteMXBeanDescription("Number of times this stage was executed.")
-    public long getTotalExecutionCount();
-
-    /**
-     * Gets stage failure count.
-     *
-     * @return Stage failure count.
-     */
-    @IgniteMXBeanDescription("Stage failure count.")
-    public int getFailuresCount();
-
-    /**
-     * Gets flag indicating if stage is being currently executed by at least 
one thread on current node.
-     *
-     * @return {@code True} if stage is executing now.
-     */
-    @IgniteMXBeanDescription("Whether stage is currently being executed.")
-    public boolean isExecuting();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMXBean.java
deleted file mode 100644
index 015428a..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMXBean.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.streamer;
-
-import org.apache.ignite.mxbean.*;
-
-/**
- * Streamer window MXBean.
- */
-@IgniteMXBeanDescription("MXBean that provides access to streamer window 
description.")
-public interface StreamerWindowMXBean {
-    /**
-     * Gets window name.
-     *
-     * @return Window name.
-     */
-    @IgniteMXBeanDescription("Window name.")
-    public String getName();
-
-    /**
-     * Gets window class name.
-     *
-     * @return Window class name.
-     */
-    @IgniteMXBeanDescription("Window class name.")
-    public String getClassName();
-
-    /**
-     * Gets current window size.
-     *
-     * @return Current window size.
-     */
-    @IgniteMXBeanDescription("Window size.")
-    public int getSize();
-
-    /**
-     * Gets estimate for window eviction queue size.
-     *
-     * @return Eviction queue size estimate.
-     */
-    @IgniteMXBeanDescription("Eviction queue size estimate.")
-    public int getEvictionQueueSize();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProvider.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProvider.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProvider.java
index cd8b6df..bfbd89f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProvider.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProvider.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.streamer.index;
 
 import org.apache.ignite.*;
+import org.apache.ignite.mxbean.*;
 
 /**
  * Represents an actual instance of an index. Used by a {@link 
org.apache.ignite.streamer.StreamerWindow}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMXBean.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMXBean.java
deleted file mode 100644
index bd3be7e..0000000
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMXBean.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.streamer.index;
-
-import org.apache.ignite.mxbean.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Streamer window index provider MXBean.
- */
-public interface StreamerIndexProviderMXBean {
-    /**
-     * Index name.
-     *
-     * @return Index name.
-     */
-    @IgniteMXBeanDescription("Index name.")
-    @Nullable public String name();
-
-    /**
-     * Gets index updater class name.
-     *
-     * @return Index updater class.
-     */
-    @IgniteMXBeanDescription("Index updater class name.")
-    public String updaterClass();
-
-    /**
-     * Gets index unique flag.
-     *
-     * @return Index unique flag.
-     */
-    @IgniteMXBeanDescription("Index unique flag.")
-    public boolean unique();
-
-    /**
-     * Returns {@code true} if index supports sorting and therefore can 
perform range operations.
-     *
-     * @return Index sorted flag.
-     */
-    @IgniteMXBeanDescription("Index sorted flag.")
-    public boolean sorted();
-
-    /**
-     * Gets index policy.
-     *
-     * @return Index policy.
-     */
-    @IgniteMXBeanDescription("Index policy.")
-    public StreamerIndexPolicy policy();
-
-    /**
-     * Gets current index size.
-     *
-     * @return Current index size.
-     */
-    @IgniteMXBeanDescription("Current index size.")
-    public int size();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
index 0f1ab25..6e58e4e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerWindowAdapter.java
@@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.streamer.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.streamer.*;
 import org.apache.ignite.streamer.index.*;
 import org.apache.ignite.internal.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java
index 009112b..af94998 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/IgniteMXBeanSelfTest.java
@@ -290,7 +290,7 @@ public class IgniteMXBeanSelfTest extends 
GridCommonAbstractTest {
      * Test MBean implementation.
      */
     public class IgniteMXBeanImplementation implements IgniteMXBeanInterface, 
IgniteMXBeanInterfaceBad,
-            IgniteMXBeanInterfaceBadAgain, 
IgniteMXBeanInterfaceEmptyDescription, IgniteMXBeanInterfaceEmptyName {
+        IgniteMXBeanInterfaceBadAgain, IgniteMXBeanInterfaceEmptyDescription, 
IgniteMXBeanInterfaceEmptyName {
 
         /** {@inheritDoc} */
         @Override public String doSomething(boolean ignored, String someData) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4916c90c/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMXBean.java
----------------------------------------------------------------------
diff --git 
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMXBean.java
 
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMXBean.java
index 603edd2..5a6145c 100644
--- 
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMXBean.java
+++ 
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMXBean.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.spi.deployment.uri;
 
 import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.*;
 
 import java.util.*;
 

Reply via email to