http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java deleted file mode 100644 index 77200f2..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java +++ /dev/null @@ -1,153 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.logger; - -import org.gridgain.grid.util.tostring.*; -import org.jetbrains.annotations.*; - -/** - * This interface defines basic logging functionality used throughout the system. We had to - * abstract it out so that we can use whatever logging is used by the hosting environment. - * Currently, <a target=_new href="http://logging.apache.org/log4j/docs/";>log4j</a>, - * <a target=_new href="http://www.jboss.org/developers/guides/logging";>JBoss</a>, - * <a target=_new href="http://jakarta.apache.org/commons/logging/";>JCL</a> and - * console logging are provided as supported implementations. - * <p> - * GridGain logger could be configured either from code (for example log4j logger): - * <pre name="code" class="java"> - * GridConfiguration cfg = new GridConfiguration(); - * ... - * URL xml = U.resolveGridGainUrl("config/custom-log4j.xml"); - * GridLogger log = new GridLog4jLogger(xml); - * ... - * cfg.setGridLogger(log); - * </pre> - * or in grid configuration file (see JCL logger example below): - * <pre name="code" class="xml"> - * ... - * <property name="gridLogger"> - * <bean class="org.gridgain.grid.logger.jcl.GridJclLogger"> - * <constructor-arg type="org.apache.commons.logging.Log"> - * <bean class="org.apache.commons.logging.impl.Log4JLogger"> - * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> - * </bean> - * </constructor-arg> - * </bean> - * </property> - * ... - * </pre> - * It's recommended to use GridGain's logger injection instead of using/instantiating - * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger - * injection. - * <h1 class="header">Quiet Mode</h1> - * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG} - * log output. If system property {@code GRIDGAIN_QUIET} is set to {@code false} than GridGain - * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is - * done through standard output (STDOUT). - * <p> - * Note that GridGain's standard startup scripts <tt>$GRIDGAIN_HOME/bin/ggstart.{sh|bat}</tt> start - * by default in "quiet" mode. Both scripts accept {@code -v} arguments to turn off "quiet" mode. - */ -@GridToStringExclude -public interface IgniteLogger { - /** - * Creates new logger with given category based off the current instance. - * - * @param ctgr Category for new logger. - * @return New logger with given category. - */ - public IgniteLogger getLogger(Object ctgr); - - /** - * Logs out trace message. - * - * @param msg Trace message. - */ - public void trace(String msg); - - /** - * Logs out debug message. - * - * @param msg Debug message. - */ - public void debug(String msg); - - /** - * Logs out information message. - * - * @param msg Information message. - */ - public void info(String msg); - - /** - * Logs out warning message. - * - * @param msg Warning message. - */ - public void warning(String msg); - - /** - * Logs out warning message with optional exception. - * - * @param msg Warning message. - * @param e Optional exception (can be {@code null}). - */ - public void warning(String msg, @Nullable Throwable e); - - /** - * Logs out error message. - * - * @param msg Error message. - */ - public void error(String msg); - - /** - * Logs error message with optional exception. - * - * @param msg Error message. - * @param e Optional exception (can be {@code null}). - */ - public void error(String msg, @Nullable Throwable e); - - /** - * Tests whether {@code trace} level is enabled. - * - * @return {@code true} in case when {@code trace} level is enabled, {@code false} otherwise. - */ - public boolean isTraceEnabled(); - - /** - * Tests whether {@code debug} level is enabled. - * - * @return {@code true} in case when {@code debug} level is enabled, {@code false} otherwise. - */ - public boolean isDebugEnabled(); - - /** - * Tests whether {@code info} level is enabled. - * - * @return {@code true} in case when {@code info} level is enabled, {@code false} otherwise. - */ - public boolean isInfoEnabled(); - - /** - * Tests whether {@code info} and {@code debug} levels are turned off. - * - * @return Whether {@code info} and {@code debug} levels are turned off. - */ - public boolean isQuiet(); - - /** - * Gets name of the file being logged to if one is configured or {@code null} otherwise. - * - * @return Name of the file being logged to if one is configured or {@code null} otherwise. - */ - @Nullable public String fileName(); -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java index c292234..c5da9cf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java +++ b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java @@ -9,6 +9,7 @@ package org.gridgain.grid.logger.java; +import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java index 32f885f..76b81bc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java +++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java @@ -9,10 +9,10 @@ package org.gridgain.grid.marshaller; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.executor.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java index 399eebb..b8fc789 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java @@ -9,6 +9,7 @@ package org.gridgain.grid.spi; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.resources.*; @@ -16,7 +17,6 @@ import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.authentication.*; import org.gridgain.grid.spi.securesession.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java index 6d0fbfc..72264bb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java index ed14b95..fd4c08e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java @@ -9,7 +9,8 @@ package org.gridgain.grid.spi; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; + import java.util.concurrent.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java index 05b5c3c..1338faf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.authentication.noop; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.kernal.managers.security.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.authentication.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java index 1b65b48..e1fe7d7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java @@ -1,10 +1,10 @@ package org.gridgain.grid.spi.checkpoint.cache; +import org.apache.ignite.*; import org.apache.ignite.events.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java index 881059a..d4571f2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.checkpoint.jdbc; +import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java index 762c8f2..bb7d394 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.checkpoint.noop; +import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java index 18b4e47..3af3d65 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java index a7e2996..4e9174f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java index 868be56..d668ffc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java index 71c2153..79dcd0a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.collision.fifoqueue; +import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java index 9d197f1..3a0de30 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java @@ -9,13 +9,13 @@ package org.gridgain.grid.spi.collision.jobstealing; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.resources.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.spi.failover.jobstealing.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java index 3d52551..4899976 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.collision.priorityqueue; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java index 51250a4..f184747 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java @@ -9,13 +9,13 @@ package org.gridgain.grid.spi.communication.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.product.*; import org.gridgain.grid.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java index 336e52b..9fdfb0d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.deployment.local; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.deployment.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java index 459b0d0..c5a7276 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java @@ -9,13 +9,13 @@ package org.gridgain.grid.spi.discovery.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.security.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java index 09523aa..970d9d2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java @@ -9,10 +9,10 @@ package org.gridgain.grid.spi.discovery.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.product.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java index 3b0cae3..3ff78b9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java index c1ccff5..f525818 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java index 1230724..5a0b1d3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java index af924dc..4906f2c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.vm; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java index 2df41a0..7ada03d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java @@ -9,10 +9,10 @@ package org.gridgain.grid.spi.eventstorage.memory; +import org.apache.ignite.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.eventstorage.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java index edc5390..357144e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java @@ -9,10 +9,10 @@ package org.gridgain.grid.spi.failover.always; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.failover.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java index afdda0f..f6037ff 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java @@ -9,10 +9,10 @@ package org.gridgain.grid.spi.failover.jobstealing; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.jobstealing.*; import org.gridgain.grid.spi.failover.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java index 11340fc..57fc35f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.failover.never; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.failover.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java index b049241..b5f7ad3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.indexing; +import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java index 49eed35..98f803a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java @@ -9,6 +9,7 @@ package org.gridgain.grid.spi.loadbalancing.adaptive; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; @@ -16,7 +17,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.*; import org.gridgain.grid.spi.loadbalancing.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java index adc3c36..d3855fe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java @@ -9,11 +9,11 @@ package org.gridgain.grid.spi.loadbalancing.roundrobin; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java index 24b4072..95fdc61 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java @@ -9,6 +9,7 @@ package org.gridgain.grid.spi.loadbalancing.roundrobin; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; @@ -16,7 +17,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.loadbalancing.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java index 200847f..c71f20e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java @@ -9,13 +9,13 @@ package org.gridgain.grid.spi.loadbalancing.weightedrandom; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.loadbalancing.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java index fc5632d..3efdaf0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.securesession.noop; +import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.securesession.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java index 26791eb..4369071 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java @@ -9,10 +9,10 @@ package org.gridgain.grid.spi.swapspace.file; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.swapspace.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java index e87860b..b098a0c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java @@ -9,9 +9,9 @@ package org.gridgain.grid.spi.swapspace.noop; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.swapspace.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java b/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java index fa1bc10..ecddfd0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java b/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java index e2c23bb..8360b9e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java index 8fbee98..82c59e3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java @@ -23,7 +23,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.streamer.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.product.*; import org.gridgain.grid.spi.*; @@ -3734,7 +3733,7 @@ public abstract class GridUtils { } /** - * Shortcut for {@link #error(org.gridgain.grid.logger.IgniteLogger, Object, Object, Throwable)}. + * Shortcut for {@link #error(org.apache.ignite.IgniteLogger, Object, Object, Throwable)}. * * @param log Optional logger. * @param shortMsg Message to log using quiet logger. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java index c233a36..03d07bb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java @@ -9,10 +9,10 @@ package org.gridgain.grid.util.future; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java index 90e5e66..4378f4a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.ipc; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.ipc.loopback.*; import org.gridgain.grid.util.ipc.shmem.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java index 772fdb8..cc52959 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.ipc; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java index 5912c31..699b033 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java @@ -9,9 +9,9 @@ package org.gridgain.grid.util.ipc.loopback; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.ipc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java index e17d5d4..cf96ed8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.ipc.shmem; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.ipc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java index e096e01..5fcdc26 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java @@ -9,10 +9,10 @@ package org.gridgain.grid.util.ipc.shmem; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java index ccaf250..9180c1d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.ipc.shmem; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java index 87301ab..45a4019 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import java.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java index 343af03..53beb21 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.worker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java index 9259b62..4a730a5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java index c18de6f..70bf0bf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java index 02f36d9..0f6acb4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java @@ -9,9 +9,9 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.direct.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java index 8b4fee1..d5dec86 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.ipc.shmem.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java index f29efcf..282c0e1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio.ssl; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java index 56a58f6..dbfd293 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.nio.ssl; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java index a47a3f8..d15a636 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java @@ -9,9 +9,9 @@ package org.gridgain.grid.util.nodestart; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java index 7646e73..6d77a3f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java @@ -9,7 +9,7 @@ package org.gridgain.grid.util.nodestart; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java index 7bfdf51..1775505 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java @@ -9,8 +9,8 @@ package org.gridgain.grid.util.worker; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java index ef01c72..02b0f86 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java @@ -9,9 +9,9 @@ package org.gridgain.grid.util.worker; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java b/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java index f96890a..de509c7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java @@ -9,9 +9,9 @@ package org.gridgain.grid; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; /** * Test job. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java b/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java index bbfffe4..a509db4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java @@ -9,9 +9,9 @@ package org.gridgain.grid; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java index 8426009..96bb536 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java index 43e29b8..20b4d29 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.spi.discovery.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java index 76d9e1d..fd382ab 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java index 3ee3672..bf7cd1f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java index c5b66cb..1cd05ec 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java index a3eefe8..0278a98 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java @@ -17,7 +17,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.deployment.local.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java index 77c6b88..dcf2dfb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java index 0286580..672c87b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java index e01d16d..ddc2741 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.failover.*; import org.gridgain.grid.spi.failover.always.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java index 4eb585c..eff3732 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java index 03c5ef3..023de74 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java @@ -19,7 +19,6 @@ import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.managers.communication.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java index a9ab7c3..b30a1ab 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.collision.jobstealing.*; import org.gridgain.grid.spi.failover.jobstealing.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java index eff41a7..fc1ccc2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.collision.jobstealing.*; import org.gridgain.grid.spi.failover.jobstealing.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java index 53c915f..443027c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java @@ -17,7 +17,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java index a88138e..2cbfda4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.collision.jobstealing.*; import org.gridgain.grid.spi.failover.jobstealing.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java index 8c006ff..93f06d7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java @@ -17,7 +17,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java index f6bec61..3f24b06 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java index 6edb3f5..1a7536c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java index c623363..44722d2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.failover.always.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java index 99a5fea..11b2a3a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java @@ -15,7 +15,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java index 96965f4..cc4b34f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java index 818a856..9b463d2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java @@ -12,7 +12,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java index b8162bc..9285081 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java index 9ef4422..ebe348e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java index 49d7b7a..a58ee8f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java index 222fc12..2500b0d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java index 66105bd..e0771a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java @@ -737,7 +737,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb } /** - * Wrapper around {@link GridTestUtils#retryAssert(org.gridgain.grid.logger.IgniteLogger, int, long, GridAbsClosure)}. + * Wrapper around {@link GridTestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}. * For the given closure provides count of retries, configured by {@link #retries} attribute. * @param assertion Closure with assertion inside. * @throws GridInterruptedException If was interrupted.
