#ignite-128: Fixes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b33438c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b33438c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b33438c Branch: refs/heads/ignite-128 Commit: 1b33438ce9fd3bb49b241752cbbf974af91e9963 Parents: e8d42f5 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 4 09:56:24 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 4 09:56:24 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/TaskEventSubjectIdSelfTest.java | 1 - .../client/ClientAbstractMultiThreadedSelfTest.java | 6 ------ .../internal/client/impl/ClientComputeImplSelfTest.java | 1 - .../internal/client/impl/ClientDataImplSelfTest.java | 1 - .../client/impl/ClientFutureAdapterSelfTest.java | 1 - .../client/impl/ClientPartitionAffinitySelfTest.java | 1 - .../integration/ClientAbstractMultiNodeSelfTest.java | 4 ---- .../client/integration/ClientAbstractSelfTest.java | 6 ++---- .../client/integration/ClientPreferDirectSelfTest.java | 2 -- .../internal/client/router/RouterFactorySelfTest.java | 1 - .../client/util/ClientConsistentHashSelfTest.java | 1 - .../processors/rest/RestProcessorStartSelfTest.java | 1 - .../processors/rest/TaskCommandHandlerSelfTest.java | 3 +-- .../ignite/configuration/IgniteConfiguration.java | 12 ++++-------- .../client/impl/GridClientAbstractProjection.java | 2 +- .../connection/GridClientConnectionManagerAdapter.java | 3 +-- .../client/router/GridTcpRouterConfiguration.java | 1 - .../router/impl/GridRouterCommandLineStartup.java | 2 -- .../internal/client/router/impl/GridTcpRouterImpl.java | 2 -- .../processors/portable/os/GridOsPortableProcessor.java | 1 - .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 --- .../ignite/internal/GridLifecycleAwareSelfTest.java | 1 - .../org/apache/ignite/testframework/GridTestUtils.java | 2 -- 23 files changed, 9 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java index 1fc55c8..b691e1c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal; import org.apache.ignite.*; -import org.apache.ignite.client.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index 55d13dc..c347a43 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -20,9 +20,6 @@ package org.apache.ignite.internal.client; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.client.balancer.*; -import org.apache.ignite.client.impl.*; -import org.apache.ignite.client.ssl.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -35,12 +32,9 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import org.junit.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java index 1383096..e120005 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientComputeImplSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.client.impl; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java index 6e2ca45..9de9a62 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientDataImplSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.client.impl; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; import org.apache.ignite.testframework.junits.common.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java index 6c42e50..daa9445 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientFutureAdapterSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.client.impl; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java index 77a63e2..3a45615 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.client.*; -import org.apache.ignite.internal.client.impl.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index f995356..a1beae0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -40,10 +40,6 @@ import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.internal.managers.communication.*; -import org.apache.ignite.internal.processors.cache.transactions.*; -import org.apache.ignite.internal.util.direct.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index cfdca12..fff8c9e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -22,19 +22,17 @@ import net.sf.json.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.store.*; -import org.apache.ignite.client.*; -import org.apache.ignite.client.ssl.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.client.ssl.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java index 8a13ade..a236e2e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java @@ -18,8 +18,6 @@ package org.apache.ignite.internal.client.integration; import org.apache.ignite.*; -import org.apache.ignite.client.*; -import org.apache.ignite.client.balancer.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.client.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java index 6ef5c7b..e82393b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.client.router; import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.client.router.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java index 1b67433..7fb4501 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.client.util; -import org.apache.ignite.internal.client.util.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java index bf9b044..8db093a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.rest; -import org.apache.ignite.client.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.client.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 3c7b1ac..f160910 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.client.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -37,9 +36,9 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.internal.client.GridClientProtocol.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.internal.client.GridClientProtocol.*; /** * Test for {@code GridTaskCommandHandler} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 3910df8..e43fda6 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -19,21 +19,17 @@ package org.apache.ignite.configuration; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.client.ssl.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; +import org.apache.ignite.hadoop.*; import org.apache.ignite.internal.client.ssl.*; +import org.apache.ignite.internal.managers.eventstorage.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.managed.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.*; -import org.apache.ignite.portables.*; -import org.apache.ignite.spi.authentication.*; -import org.apache.ignite.spi.indexing.*; -import org.apache.ignite.streamer.*; -import org.apache.ignite.hadoop.*; -import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.plugin.segmentation.*; import org.apache.ignite.portables.*; @@ -49,7 +45,7 @@ import org.apache.ignite.spi.indexing.*; import org.apache.ignite.spi.loadbalancing.*; import org.apache.ignite.spi.securesession.*; import org.apache.ignite.spi.swapspace.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.streamer.*; import javax.management.*; import java.lang.management.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java index 2b55bf5..bf8e7df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client.impl; -import org.apache.ignite.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.client.balancer.*; import org.apache.ignite.internal.client.impl.connection.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java index becfaf6..e9a3267 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.client.impl.*; import org.apache.ignite.internal.client.util.*; -import org.apache.ignite.logger.java.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.direct.*; import org.apache.ignite.internal.util.nio.*; @@ -41,8 +40,8 @@ import java.util.concurrent.*; import java.util.logging.*; import static java.util.logging.Level.*; -import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*; import static org.apache.ignite.internal.GridNodeAttributes.*; +import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*; /** * Cached connections manager. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java index 4221282..b753146 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.client.router; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.plugin.security.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.security.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java index 41397a7..ccd0cc9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java @@ -19,8 +19,6 @@ package org.apache.ignite.internal.client.router.impl; import org.apache.ignite.*; import org.apache.ignite.internal.client.router.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.lifecycle.*; import org.apache.ignite.internal.processors.spring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java index 4636da8..acfd924 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java @@ -21,8 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.client.router.*; import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.lifecycle.*; -import org.apache.ignite.logger.java.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.nio.ssl.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java index c8d4348..718231f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.portable.os; -import org.apache.ignite.client.marshaller.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.processors.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index e77c1d0..6032244 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -24,9 +24,6 @@ import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.client.marshaller.jdk.*; import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.marshaller.*; -import org.apache.ignite.marshaller.jdk.*; -import org.apache.ignite.spi.*; import org.apache.ignite.internal.processors.rest.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.processors.rest.protocols.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java index 95495d7..68eee85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal; import org.apache.ignite.*; -import org.apache.ignite.client.ssl.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.client.ssl.*; import org.apache.ignite.lifecycle.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b33438c/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index a308ae9..465393a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -25,8 +25,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.client.ssl.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.util.*;
