Repository: incubator-ignite Updated Branches: refs/heads/master 96aa517ab -> 09169c7f9
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java index 370217c..32f0355 100644 --- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java +++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java @@ -10,7 +10,7 @@ package org.gridgain.grid.logger.log4j; import junit.framework.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java index 922f33f..27780f7 100644 --- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java +++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java @@ -10,7 +10,7 @@ package org.gridgain.grid.logger.log4j; import junit.framework.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.testframework.junits.common.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java index 504746f..0cf5590 100644 --- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java +++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java @@ -10,7 +10,7 @@ package org.gridgain.grid.logger.log4j; import junit.framework.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java index 2cf460f..1c89be9 100644 --- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java +++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java @@ -10,7 +10,7 @@ package org.gridgain.grid.logger.log4j; import junit.framework.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.testframework.junits.common.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java index 6999c40..277e1cf 100644 --- a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java +++ b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java @@ -10,13 +10,13 @@ package org.gridgain.grid.kernal.processors.rest.protocols.http.jetty; import net.sf.json.*; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.eclipse.jetty.server.*; import org.eclipse.jetty.server.handler.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.rest.*; import org.gridgain.grid.kernal.processors.rest.request.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.security.*; 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/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java index 23ec09a..ab88b2c 100644 --- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java +++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java @@ -10,12 +10,12 @@ package org.gridgain.grid.kernal.processors.schedule; import it.sauronsoftware.cron4j.*; +import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.scheduler.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.timeout.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.future.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java index 9cc46c0..4ae2c24 100644 --- a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java +++ b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.scheduler.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java b/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java index e3bde5b..68b1904 100644 --- a/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java +++ b/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java @@ -9,7 +9,7 @@ package org.gridgain.grid.logger.slf4j; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.lang.*; import org.jetbrains.annotations.*; import org.slf4j.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java index 66ecf57..20857d1 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java @@ -16,7 +16,6 @@ import org.apache.ignite.plugin.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.dr.*; import org.gridgain.grid.hadoop.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.product.*; import org.gridgain.grid.security.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java b/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java index a919f84..006e50a 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java +++ b/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java @@ -9,11 +9,11 @@ package org.gridgain.grid.kernal.processors.spring; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; -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/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java index 512b876..f7df53f 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java +++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java @@ -11,7 +11,6 @@ package org.gridgain.grid.external.resource; import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.springframework.context.*; import javax.management.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java index 7d83263..2475be8 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java +++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java @@ -9,10 +9,10 @@ package org.gridgain.grid.external.resource; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java index 1b7ac89..8b17ed6 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java +++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java @@ -9,10 +9,10 @@ package org.gridgain.grid.external.resource; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java index 8856cca..cdd68d4 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lifecycle.*; 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.collision.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java index 868a406..b1bafd3 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java @@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.resource; import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.springframework.context.*; import javax.management.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java index bec6c89..a1f0ef6 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.logger.*; 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/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java index e528d4a..dcd69e1 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.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.testframework.junits.common.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java index 0bdb3d0..48d781e 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.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.marshaller.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java index 6d22409..fc2c161 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.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.*; import org.gridgain.testframework.junits.common.*; import org.springframework.beans.factory.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java index 0ebcf51..1e712df 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.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.testframework.*; import org.gridgain.testframework.junits.common.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java index 7072185..60e51d4 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.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.testframework.*; import org.gridgain.testframework.junits.common.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java index 1e1ba9d..3ba8d23 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.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.marshaller.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java index 78fd5a8..7e6f719 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.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.*; import org.gridgain.testframework.junits.common.*; import org.springframework.context.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java index e0d20c6..e9d992b 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.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.testframework.*; import org.gridgain.testframework.junits.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java index a9ce1a3..60c6618 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.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.testframework.*; import org.gridgain.testframework.junits.common.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java index 896d9cc..5ccf03d 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.resource; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.junit.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java index fe0d7dd..197be2c 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java +++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java @@ -11,7 +11,6 @@ package org.gridgain.grid.p2p; import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.logger.*; import org.springframework.context.*; import javax.management.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java index b2c55e9..71482b6 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; -import org.gridgain.grid.logger.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java index 16dca1d..77257b1 100644 --- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java @@ -10,9 +10,9 @@ package org.gridgain.grid.util.nodestart; import com.jcraft.jsch.*; +import org.apache.ignite.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.lang.*; 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/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java index a956c55..cf972bb 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.spi.*; import java.io.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java index 8ad84cf..e6865d1 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java @@ -11,9 +11,9 @@ package org.gridgain.grid.spi.deployment.uri; import org.apache.commons.codec.binary.*; import org.apache.commons.codec.digest.*; +import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.gridgain.grid.*; -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/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java index e083a70..9c6701b 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.security.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java index 688ac0a..ed66dd8 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java @@ -9,11 +9,11 @@ package org.gridgain.grid.spi.deployment.uri; +import org.apache.ignite.*; 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.spi.*; import org.gridgain.grid.spi.deployment.*; import org.gridgain.grid.spi.deployment.uri.scanners.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java index 539622d..108a85a 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.typedef.internal.*; import org.springframework.beans.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java index c900ab5..a382dc9 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri.scanners; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.spi.*; 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/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java index 365db28..2f21efe 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri.scanners.file; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.deployment.uri.scanners.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java index 968dab6..4f84bf9 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java @@ -10,7 +10,7 @@ package org.gridgain.grid.spi.deployment.uri.scanners.ftp; import com.enterprisedt.net.ftp.*; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.text.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java index ab6cb58..87543dd 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java @@ -9,8 +9,8 @@ package org.gridgain.grid.spi.deployment.uri.scanners.ftp; +import org.apache.ignite.*; import org.gridgain.grid.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.spi.deployment.uri.scanners.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java index 4d25f2f..af593ed 100644 --- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java +++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java @@ -9,7 +9,7 @@ package org.gridgain.grid.spi.deployment.uri.scanners.http; -import org.gridgain.grid.logger.*; +import org.apache.ignite.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.deployment.uri.scanners.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java ---------------------------------------------------------------------- diff --git a/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java b/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java index efed878..763a45d 100644 --- a/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java +++ b/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java @@ -11,8 +11,8 @@ package org.gridgain.visor.plugin; +import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.logger.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java index bfe8655..e3f7034 100644 --- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.startup.servlet.*; 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/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java index 544939f..ffcf5ef 100644 --- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java +++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java @@ -12,7 +12,6 @@ package org.gridgain.grid.cache.websession; import org.apache.ignite.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.logger.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*;
