ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [07/25] incubator-ignite git commit: # sprint-1 Renamed package mbean - mxbean.
Date Tue, 27 Jan 2015 07:02:40 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteStandardMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteStandardMBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteStandardMBean.java
new file mode 100644
index 0000000..4789bc6
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteStandardMBean.java
@@ -0,0 +1,275 @@
+/*
+ * 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 org.apache.ignite.internal.util.typedef.internal.*;
+import javax.management.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+/**
+ * Extension of standard Java MBean. Overrides some hooks to return
+ * annotation based descriptions.
+ */
+public class IgniteStandardMBean extends StandardMBean {
+    /**
+     * Objects maps from primitive classes to primitive object classes.
+     */
+    private static final Map<String, Class<?>> primCls = new HashMap<>();
+
+    /**
+     * Static constructor.
+     */
+    static{
+        primCls.put(Boolean.TYPE.toString().toLowerCase(), Boolean.TYPE);
+        primCls.put(Character.TYPE.toString().toLowerCase(), Character.TYPE);
+        primCls.put(Byte.TYPE.toString().toLowerCase(), Byte.TYPE);
+        primCls.put(Short.TYPE.toString().toLowerCase(), Short.TYPE);
+        primCls.put(Integer.TYPE.toString().toLowerCase(), Integer.TYPE);
+        primCls.put(Long.TYPE.toString().toLowerCase(), Long.TYPE);
+        primCls.put(Float.TYPE.toString().toLowerCase(), Float.TYPE);
+        primCls.put(Double.TYPE.toString().toLowerCase(), Double.TYPE);
+    }
+
+    /**
+     * Make a DynamicMBean out of the object implementation, using the specified
+     * mbeanInterface class.
+     *
+     * @param implementation The implementation of this MBean.
+     * @param mbeanInterface The Management Interface exported by this
+     *      MBean's implementation. If {@code null}, then this
+     *      object will use standard JMX design pattern to determine
+     *      the management interface associated with the given
+     *      implementation.
+     *      If {@code null} value passed then information will be built by
+     *      {@link StandardMBean}
+     *
+     * @exception NotCompliantMBeanException if the {@code mbeanInterface}
+     *    does not follow JMX design patterns for Management Interfaces, or
+     *    if the given {@code implementation} does not implement the
+     *    specified interface.
+     */
+    public <T> IgniteStandardMBean(T implementation, Class<T> mbeanInterface)
+        throws NotCompliantMBeanException {
+        super(implementation, mbeanInterface);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String getDescription(MBeanAttributeInfo info) {
+        String str = super.getDescription(info);
+
+        String methodName = (info.isIs() ? "is" : "get") + info.getName();
+
+        try {
+            // Recursively get method.
+            Method mtd = findMethod(getMBeanInterface(), methodName, new Class[]{});
+
+            if (mtd != null) {
+                IgniteMBeanDescription desc = mtd.getAnnotation(IgniteMBeanDescription.class);
+
+                if (desc != null) {
+                    str = desc.value();
+
+                    assert str != null : "Failed to find method: " + mtd;
+                    assert str.trim().length() > 0 : "Method description cannot be empty: " + mtd;
+
+                    // Enforce proper English.
+                    assert Character.isUpperCase(str.charAt(0)) == true :
+                        "Description must start with upper case: " + str;
+
+                    assert str.charAt(str.length() - 1) == '.' : "Description must end with period: " + str;
+                }
+            }
+        }
+        catch (SecurityException e) {
+            // No-op. Default value will be returned.
+        }
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String getDescription(MBeanInfo info) {
+        String str = super.getDescription(info);
+
+        // Return either default one or given by annotation.
+        IgniteMBeanDescription desc = U.getAnnotation(getMBeanInterface(), IgniteMBeanDescription.class);
+
+        if (desc != null) {
+            str = desc.value();
+
+            assert str != null;
+            assert str.trim().length() > 0;
+
+            // Enforce proper English.
+            assert Character.isUpperCase(str.charAt(0)) == true : str;
+            assert str.charAt(str.length() - 1) == '.' : str;
+        }
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String getDescription(MBeanOperationInfo info) {
+        String str = super.getDescription(info);
+
+        try {
+            Method m = getMethod(info);
+
+            IgniteMBeanDescription desc = m.getAnnotation(IgniteMBeanDescription.class);
+
+            if (desc != null) {
+                str = desc.value();
+
+                assert str != null;
+                assert str.trim().length() > 0;
+
+                // Enforce proper English.
+                assert Character.isUpperCase(str.charAt(0)) == true : str;
+                assert str.charAt(str.length() - 1) == '.' : str;
+            }
+        }
+        catch (SecurityException | ClassNotFoundException e) {
+            // No-op. Default value will be returned.
+        }
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String getDescription(MBeanOperationInfo op, MBeanParameterInfo param, int seq) {
+        String str = super.getDescription(op, param, seq);
+
+        try {
+            Method m = getMethod(op);
+
+            IgniteMBeanParametersDescriptions decsAnn = m.getAnnotation(IgniteMBeanParametersDescriptions.class);
+
+            if (decsAnn != null) {
+                assert decsAnn.value() != null;
+                assert seq < decsAnn.value().length;
+
+                str = decsAnn.value()[seq];
+
+                assert str != null;
+                assert str.trim().length() > 0;
+
+                // Enforce proper English.
+                assert Character.isUpperCase(str.charAt(0)) == true : str;
+                assert str.charAt(str.length() - 1) == '.' : str;
+            }
+        }
+        catch (SecurityException | ClassNotFoundException e) {
+            // No-op. Default value will be returned.
+        }
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String getParameterName(MBeanOperationInfo op, MBeanParameterInfo param, int seq) {
+        String str = super.getParameterName(op, param, seq);
+
+        try {
+            Method m = getMethod(op);
+
+            IgniteMBeanParametersNames namesAnn = m.getAnnotation(IgniteMBeanParametersNames.class);
+
+            if (namesAnn != null) {
+                assert namesAnn.value() != null;
+                assert seq < namesAnn.value().length;
+
+                str = namesAnn.value()[seq];
+
+                assert str != null;
+                assert str.trim().length() > 0;
+            }
+        }
+        catch (SecurityException | ClassNotFoundException e) {
+            // No-op. Default value will be returned.
+        }
+
+        return str;
+    }
+
+    /**
+     * Gets method by operation info.
+     *
+     * @param op MBean operation info.
+     * @return Method.
+     * @throws ClassNotFoundException Thrown if parameter type is unknown.
+     * @throws SecurityException Thrown if method access is not allowed.
+     */
+    private Method getMethod(MBeanOperationInfo op) throws ClassNotFoundException, SecurityException {
+        String methodName = op.getName();
+
+        MBeanParameterInfo[] signature = op.getSignature();
+
+        Class<?>[] params = new Class<?>[signature.length];
+
+        for (int i = 0; i < signature.length; i++) {
+            // Parameter type is either a primitive type or class. Try both.
+            Class<?> type = primCls.get(signature[i].getType().toLowerCase());
+
+            if (type == null)
+                type = Class.forName(signature[i].getType());
+
+            params[i] = type;
+        }
+
+        return findMethod(getMBeanInterface(), methodName, params);
+    }
+
+    /**
+     * Finds method for the given interface.
+     *
+     * @param itf MBean interface.
+     * @param methodName Method name.
+     * @param params Method parameters.
+     * @return Method.
+     */
+    @SuppressWarnings("unchecked")
+    private Method findMethod(Class itf, String methodName, Class[] params) {
+        assert itf.isInterface() == true;
+
+        Method res = null;
+
+        // Try to get method from given interface.
+        try {
+            res = itf.getDeclaredMethod(methodName, params);
+
+            if (res != null)
+                return res;
+        }
+        catch (NoSuchMethodException e) {
+            // No-op. Default value will be returned.
+        }
+
+        // Process recursively super interfaces.
+        Class[] superItfs = itf.getInterfaces();
+
+        for (Class superItf: superItfs) {
+            res = findMethod(superItf, methodName, params);
+
+            if (res != null)
+                return res;
+        }
+
+        return res;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMBean.java
new file mode 100644
index 0000000..3746527
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteThreadPoolMBean.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.
+ */
+@IgniteMBeanDescription("MBean that provides access to information about executor service.")
+public interface IgniteThreadPoolMBean {
+    /**
+     * Returns the approximate number of threads that are actively executing tasks.
+     *
+     * @return The number of threads.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("Approximate total number of tasks that have completed execution.")
+    public long getCompletedTaskCount();
+
+    /**
+     * Returns the core number of threads.
+     *
+     * @return The core number of threads.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("The maximum allowed number of threads.")
+    public int getMaximumPoolSize();
+
+    /**
+     * Returns the current number of threads in the pool.
+     *
+     * @return The number of threads.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("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.
+     */
+    @IgniteMBeanDescription("Class name of thread factory used to create new threads.")
+    public String getThreadFactoryClass();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMBean.java
new file mode 100644
index 0000000..adc90e9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgnitionMBean.java
@@ -0,0 +1,151 @@
+/*
+ * 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;
+
+/**
+ * This interface defines JMX view on {@link org.apache.ignite.Ignition}.
+ */
+@IgniteMBeanDescription("MBean that provides access to grid life-cycle operations.")
+public interface IgnitionMBean {
+    /**
+     * Gets state of default grid instance.
+     *
+     * @return State of default grid instance.
+     * @see org.apache.ignite.Ignition#state()
+     */
+    @IgniteMBeanDescription("State of default grid instance.")
+    public String getState();
+
+    /**
+     * Gets state for a given grid instance.
+     *
+     * @param name Name of grid instance.
+     * @return State of grid instance with given name.
+     * @see org.apache.ignite.Ignition#state(String)
+     */
+    @IgniteMBeanDescription("Gets state for a given grid instance. Returns state of grid instance with given name.")
+    @IgniteMBeanParametersNames(
+        "name"
+    )
+    @IgniteMBeanParametersDescriptions(
+        "Name of grid instance."
+    )
+    public String getState(String name);
+
+    /**
+     * Stops default grid instance.
+     *
+     * @param cancel If {@code true} then all jobs currently executing on
+     *      default grid will be cancelled by calling {@link org.apache.ignite.compute.ComputeJob#cancel()}
+     *      method. Note that just like with {@link Thread#interrupt()}, it is
+     *      up to the actual job to exit from execution.
+     * @return {@code true} if default grid instance was indeed stopped,
+     *      {@code false} otherwise (if it was not started).
+     * @see org.apache.ignite.Ignition#stop(boolean)
+     */
+    @IgniteMBeanDescription("Stops default grid instance. Return true if default grid instance was " +
+        "indeed stopped, false otherwise (if it was not started).")
+    @IgniteMBeanParametersNames(
+        "cancel"
+    )
+    @IgniteMBeanParametersDescriptions(
+        "If true then all jobs currently executing on default grid will be cancelled."
+    )
+    public boolean stop(boolean cancel);
+
+    /**
+     * Stops named grid. If {@code cancel} flag is set to {@code true} then
+     * all jobs currently executing on local node will be interrupted. If
+     * grid name is {@code null}, then default no-name grid will be stopped.
+     * It does not wait for the tasks to finish their execution.
+     *
+     * @param name Grid name. If {@code null}, then default no-name grid will
+     *      be stopped.
+     * @param cancel If {@code true} then all jobs currently will be cancelled
+     *      by calling {@link org.apache.ignite.compute.ComputeJob#cancel()} method. Note that just like with
+     *      {@link Thread#interrupt()}, it is up to the actual job to exit from
+     *      execution. If {@code false}, then jobs currently running will not be
+     *      canceled. In either case, grid node will wait for completion of all
+     *      jobs running on it before stopping.
+     * @return {@code true} if named grid instance was indeed found and stopped,
+     *      {@code false} otherwise (the instance with given {@code name} was
+     *      not found).
+     * @see org.apache.ignite.Ignition#stop(String, boolean)
+     */
+    @IgniteMBeanDescription("Stops grid by name. Cancels running jobs if cancel is true. Returns true if named " +
+        "grid instance was indeed found and stopped, false otherwise.")
+    @IgniteMBeanParametersNames(
+        {
+            "name",
+            "cancel"
+        })
+    @IgniteMBeanParametersDescriptions(
+        {
+            "Grid instance name to stop.",
+            "Whether or not running jobs should be cancelled."
+        }
+    )
+    public boolean stop(String name, boolean cancel);
+
+    /**
+     * Stops <b>all</b> started grids. If {@code cancel} flag is set to {@code true} then
+     * all jobs currently executing on local node will be interrupted.
+     * It does not wait for the tasks to finish their execution.
+     * <p>
+     * <b>Note:</b> it is usually safer and more appropriate to stop grid instances individually
+     * instead of blanket operation. In most cases, the party that started the grid instance
+     * should be responsible for stopping it.
+     *
+     * @param cancel If {@code true} then all jobs currently executing on
+     *      all grids will be cancelled by calling {@link org.apache.ignite.compute.ComputeJob#cancel()}
+     *      method. Note that just like with {@link Thread#interrupt()}, it is
+     *      up to the actual job to exit from execution
+     * @see org.apache.ignite.Ignition#stopAll(boolean)
+     */
+    @IgniteMBeanDescription("Stops all started grids.")
+    @IgniteMBeanParametersNames(
+        "cancel"
+    )
+    @IgniteMBeanParametersDescriptions(
+        "If true then all jobs currently executing on all grids will be cancelled."
+    )
+    public void stopAll(boolean cancel);
+
+    /**
+     * Restart JVM.
+     *
+     * @param cancel If {@code true} then all jobs currently executing on
+     *      all grids will be cancelled by calling {@link org.apache.ignite.compute.ComputeJob#cancel()}
+     *      method. Note that just like with {@link Thread#interrupt()}, it is
+     *      up to the actual job to exit from execution
+     * @see org.apache.ignite.Ignition#stopAll(boolean)
+     */
+    @IgniteMBeanDescription("Restart JVM.")
+    @IgniteMBeanParametersNames(
+        {
+            "cancel",
+            "wait"
+        })
+    @IgniteMBeanParametersDescriptions(
+        {
+            "If true then all jobs currently executing on default grid will be cancelled.",
+            "If true then method will wait for all task being executed until they finish their execution."
+        }
+    )
+    public void restart(boolean cancel);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/mxbean/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/package.html b/modules/core/src/main/java/org/apache/ignite/mxbean/package.html
new file mode 100644
index 0000000..f16e61d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/package.html
@@ -0,0 +1,23 @@
+<!--
+  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.
+  -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+    <!-- Package description. -->
+    Contains annotations for Dynamic MBeans.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 e3cf89f..e8c0111 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 b3361c0..e4c9b84 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.authentication.noop;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 827728f..4d08a95 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.checkpoint.cache;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 a01b40e..b31e331 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
@@ -18,7 +18,7 @@
 package org.apache.ignite.spi.checkpoint.jdbc;
 
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 abb3672..94117a5 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.checkpoint.sharedfs;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 3010066..3eb281b 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision.fifoqueue;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 e7444e2..a59d300 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision.jobstealing;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 53092e3..fa7b0d8 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.collision.priorityqueue;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 41e0b81..98a47b1 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.communication.tcp;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 6b14240..9290b22 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.deployment.local;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 c59a8de..3067472 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 cdb28b4..4201c1d 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.discovery.tcp;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 5df2a5c..e74a8ad 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.eventstorage.memory;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 74bf727..30a121e 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.failover.always;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 6bde6a2..1b76945 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.failover.jobstealing;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 fba672d..3b59249 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.failover.never;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 3100be4..5e8cb08 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.loadbalancing.adaptive;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 8681de1..fffa07a 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.loadbalancing.roundrobin;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 70ef011..64485d0 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.loadbalancing.weightedrandom;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 b946fa5..ecf0a1c 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.securesession.noop;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/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 aab38b1..07a91a6 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
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.swapspace.file;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
index 52df72e..67edc37 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.streamer;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
index d5b81b5..7769b81 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerStageMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.streamer;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 
 /**
  * Streamer stage MBean.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
index 20bf2dd..734c690 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindowMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.streamer;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 
 /**
  * Streamer window MBean.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
index 79ca806..37b7d0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/index/StreamerIndexProviderMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.streamer.index;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 6d4fbbd..d5139f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.checkpoint.cache.*;
 import org.apache.ignite.spi.checkpoint.jdbc.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
index 954cd49..edb98ff 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.util.mbeans;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.testframework.junits.common.*;
 import javax.management.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16edda18/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
index b0026ba..dbd473a 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpiMBean.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.deployment.uri;
 
-import org.apache.ignite.mbean.*;
+import org.apache.ignite.mxbean.*;
 import org.apache.ignite.spi.*;
 
 import java.util.*;


Mime
View raw message