http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java new file mode 100644 index 0000000..cd5027e --- /dev/null +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/IgniteHadoopProcessor.java @@ -0,0 +1,227 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.hadoop; + +import org.apache.ignite.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.jobtracker.*; +import org.apache.ignite.internal.processors.hadoop.planner.*; +import org.apache.ignite.internal.processors.hadoop.shuffle.*; +import org.apache.ignite.internal.processors.hadoop.taskexecutor.*; +import org.apache.ignite.internal.processors.hadoop.taskexecutor.external.*; +import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.internal.*; + +import java.util.*; +import java.util.concurrent.atomic.*; + +import static org.apache.ignite.internal.processors.hadoop.GridHadoopClassLoader.*; + +/** + * Hadoop processor. + */ +public class IgniteHadoopProcessor extends IgniteHadoopProcessorAdapter { + /** Job ID counter. */ + private final AtomicInteger idCtr = new AtomicInteger(); + + /** Hadoop context. */ + @GridToStringExclude + private GridHadoopContext hctx; + + /** Hadoop facade for public API. */ + @GridToStringExclude + private GridHadoop hadoop; + + /** + * @param ctx Kernal context. + */ + public IgniteHadoopProcessor(GridKernalContext ctx) { + super(ctx); + } + + /** {@inheritDoc} */ + @Override public void start() throws IgniteCheckedException { + if (ctx.isDaemon()) + return; + + GridHadoopConfiguration cfg = ctx.config().getHadoopConfiguration(); + + if (cfg == null) + cfg = new GridHadoopConfiguration(); + else + cfg = new GridHadoopConfiguration(cfg); + + initializeDefaults(cfg); + + validate(cfg); + + if (hadoopHome() != null) + U.quietAndInfo(log, "HADOOP_HOME is set to " + hadoopHome()); + + boolean ok = false; + + try { // Check for Hadoop installation. + hadoopUrls(); + + ok = true; + } + catch (IgniteCheckedException e) { + U.quietAndWarn(log, e.getMessage()); + } + + if (ok) { + hctx = new GridHadoopContext( + ctx, + cfg, + new GridHadoopJobTracker(), + cfg.isExternalExecution() ? new GridHadoopExternalTaskExecutor() : new GridHadoopEmbeddedTaskExecutor(), + new GridHadoopShuffle()); + + + for (GridHadoopComponent c : hctx.components()) + c.start(hctx); + + hadoop = new GridHadoopImpl(this); + } + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgniteHadoopProcessor.class, this); + } + + /** {@inheritDoc} */ + @Override public void stop(boolean cancel) throws IgniteCheckedException { + super.stop(cancel); + + if (hctx == null) + return; + + List<GridHadoopComponent> components = hctx.components(); + + for (ListIterator<GridHadoopComponent> it = components.listIterator(components.size()); it.hasPrevious();) { + GridHadoopComponent c = it.previous(); + + c.stop(cancel); + } + } + + /** {@inheritDoc} */ + @Override public void onKernalStart() throws IgniteCheckedException { + super.onKernalStart(); + + if (hctx == null) + return; + + for (GridHadoopComponent c : hctx.components()) + c.onKernalStart(); + } + + /** {@inheritDoc} */ + @Override public void onKernalStop(boolean cancel) { + super.onKernalStop(cancel); + + if (hctx == null) + return; + + List<GridHadoopComponent> components = hctx.components(); + + for (ListIterator<GridHadoopComponent> it = components.listIterator(components.size()); it.hasPrevious();) { + GridHadoopComponent c = it.previous(); + + c.onKernalStop(cancel); + } + } + + /** + * Gets Hadoop context. + * + * @return Hadoop context. + */ + public GridHadoopContext context() { + return hctx; + } + + /** {@inheritDoc} */ + @Override public GridHadoop hadoop() { + if (hadoop == null) + throw new IllegalStateException("Hadoop accelerator is disabled (Hadoop is not in classpath, " + + "is HADOOP_HOME environment variable set?)"); + + return hadoop; + } + + /** {@inheritDoc} */ + @Override public GridHadoopConfiguration config() { + return hctx.configuration(); + } + + /** {@inheritDoc} */ + @Override public GridHadoopJobId nextJobId() { + return new GridHadoopJobId(ctx.localNodeId(), idCtr.incrementAndGet()); + } + + /** {@inheritDoc} */ + @Override public IgniteFuture<?> submit(GridHadoopJobId jobId, GridHadoopJobInfo jobInfo) { + return hctx.jobTracker().submit(jobId, jobInfo); + } + + /** {@inheritDoc} */ + @Override public GridHadoopJobStatus status(GridHadoopJobId jobId) throws IgniteCheckedException { + return hctx.jobTracker().status(jobId); + } + + /** {@inheritDoc} */ + @Override public GridHadoopCounters counters(GridHadoopJobId jobId) throws IgniteCheckedException { + return hctx.jobTracker().jobCounters(jobId); + } + + /** {@inheritDoc} */ + @Override public IgniteFuture<?> finishFuture(GridHadoopJobId jobId) throws IgniteCheckedException { + return hctx.jobTracker().finishFuture(jobId); + } + + /** {@inheritDoc} */ + @Override public boolean kill(GridHadoopJobId jobId) throws IgniteCheckedException { + return hctx.jobTracker().killJob(jobId); + } + + /** + * Initializes default hadoop configuration. + * + * @param cfg Hadoop configuration. + */ + private void initializeDefaults(GridHadoopConfiguration cfg) { + if (cfg.getMapReducePlanner() == null) + cfg.setMapReducePlanner(new GridHadoopDefaultMapReducePlanner()); + } + + /** + * Validates Grid and Hadoop configuration for correctness. + * + * @param hadoopCfg Hadoop configuration. + * @throws IgniteCheckedException If failed. + */ + private void validate(GridHadoopConfiguration hadoopCfg) throws IgniteCheckedException { + if (ctx.config().isPeerClassLoadingEnabled()) + throw new IgniteCheckedException("Peer class loading cannot be used with Hadoop (disable it using " + + "GridConfiguration.setPeerClassLoadingEnabled())."); + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java index 7aa9166..7075e5f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -164,7 +164,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra */ @SuppressWarnings("ConstantConditions") private void switchHandlerErrorFlag(boolean flag) throws Exception { - GridGgfsProcessorAdapter ggfsProc = ((GridKernal)grid(0)).context().ggfs(); + IgniteFsProcessorAdapter ggfsProc = ((GridKernal)grid(0)).context().ggfs(); Map<String, GridGgfsContext> ggfsMap = getField(ggfsProc, "ggfsCache"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala index 08d3b7d..0bc66ea 100644 --- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala +++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheQueriesSpec.scala @@ -21,12 +21,8 @@ import org.apache.ignite.cache.GridCache import org.apache.ignite.cluster.ClusterNode import org.gridgain.scalar._ import scalar._ -import org.scalatest.matchers._ import org.scalatest._ import junit.JUnitRunner -import org.gridgain.grid.cache._ -import org.apache.ignite._ -import org.gridgain.grid._ import org.junit.runner.RunWith /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala index df85c08..6e40436 100644 --- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala +++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala @@ -23,11 +23,8 @@ import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.messaging.MessagingListenActor import org.gridgain.scalar._ import scalar._ -import org.scalatest.matchers._ import org.scalatest._ import junit.JUnitRunner -import org.apache.ignite._ -import org.gridgain.grid._ import collection.JavaConversions._ import java.util.UUID import org.junit.runner.RunWith http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleProcessor.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleProcessor.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleProcessor.java index c599c74..e7d8b75 100644 --- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleProcessor.java +++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/GridScheduleProcessor.java @@ -47,11 +47,11 @@ public class GridScheduleProcessor extends GridScheduleProcessorAdapter { } /** {@inheritDoc} */ - @Override public SchedulerFuture<?> schedule(final Runnable c, String pattern) { + @Override public SchedulerFuture<?> schedule(final Runnable c, String ptrn) { assert c != null; - assert pattern != null; + assert ptrn != null; - ScheduleFutureImpl<Object> fut = new ScheduleFutureImpl<>(sched, ctx, pattern); + ScheduleFutureImpl<Object> fut = new ScheduleFutureImpl<>(sched, ctx, ptrn); fut.schedule(new IgniteCallable<Object>() { @Nullable @Override public Object call() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java index 3f0a9e7..ebefd0e 100644 --- a/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java +++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java @@ -22,7 +22,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.p2p.*; import org.apache.ignite.spring.*; import org.apache.ignite.testsuites.*; -import org.gridgain.grid.cache.spring.*; /** * Spring tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java new file mode 100644 index 0000000..35bd477 --- /dev/null +++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java @@ -0,0 +1,110 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal; + +import org.apache.ignite.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.events.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.deployment.uri.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.lang.reflect.*; +import java.util.*; +import java.util.concurrent.*; + +import static java.util.concurrent.TimeUnit.*; +import static org.apache.ignite.events.IgniteEventType.*; + +/** + * Test to reproduce gg-2852. + */ +public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration c = super.getConfiguration(gridName); + + GridUriDeploymentSpi deploymentSpi = new GridUriDeploymentSpi(); + + deploymentSpi.setUriList( + Arrays.asList(U.resolveGridGainUrl("modules/core/src/test/resources/").toURI().toString())); + + if (gridName.endsWith("2")) { + // Delay deployment for 2nd grid only. + Field f = deploymentSpi.getClass().getDeclaredField("delayOnNewOrUpdatedFile"); + + f.setAccessible(true); + + f.set(deploymentSpi, true); + } + + c.setDeploymentSpi(deploymentSpi); + + return c; + } + + /** + * @throws Exception If failed. + */ + public void testDeadlock() throws Exception { + try { + Ignite g = startGrid(1); + + final CountDownLatch latch = new CountDownLatch(1); + + g.events().localListen(new IgnitePredicate<IgniteEvent>() { + @Override public boolean apply(IgniteEvent evt) { + assert evt.type() == EVT_NODE_JOINED; + + latch.countDown(); + + return true; + } + }, EVT_NODE_JOINED); + + IgniteFuture<?> f = multithreadedAsync(new Callable<Object>() { + @Override public Object call() throws Exception { + startGrid(2); + + return null; + } + }, 1); + + assert latch.await(5, SECONDS); + + info(">>> Starting task."); + + executeAsync(compute(g.cluster().forPredicate(F.equalTo(F.first(g.cluster().forRemotes().nodes())))), + "GridGarHelloWorldTask", "HELLOWORLD.MSG").get(60000); + + f.get(); + } + catch (Exception e) { + error("Test failed.", e); + + // With former version of GridDeploymentLocalStore test hangs forever. + // So, we need to forcibly exit. + // System.exit(1); + } + finally { + stopAllGrids(); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java new file mode 100644 index 0000000..bce2b28 --- /dev/null +++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java @@ -0,0 +1,211 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.p2p; + +import org.apache.ignite.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.spi.deployment.uri.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.io.*; +import java.util.*; + +/** + * Test what happens if peer class loading is disabled. + * <p> + * In order for this test to run, make sure that your + * {@code p2p.uri.cls} folder ends with {@code .gar} extension. + */ +@SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown"}) +@GridCommonTest(group = "P2P") +public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { + /** Task name. */ + private static final String TASK_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; + + /** External class loader. */ + private static ClassLoader extLdr; + + /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ + private IgniteDeploymentMode depMode; + + /** */ + private boolean initGar; + + /** Path to GAR file. */ + private String garFile; + + /** + * + */ + public GridP2PDisabledSelfTest() { + super(/*start grid*/false); + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + extLdr = getExternalClassLoader(); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setPeerClassLoadingEnabled(false); + + cfg.setDeploymentMode(depMode); + + if (initGar) { + GridUriDeploymentSpi depSpi = new GridUriDeploymentSpi(); + + depSpi.setUriList(Collections.singletonList(garFile)); + + cfg.setDeploymentSpi(depSpi); + } + + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500); + + return cfg; + } + + /** + * Test what happens if peer class loading is disabled. + * + * @throws Exception if error occur. + */ + @SuppressWarnings("unchecked") + private void checkClassNotFound() throws Exception { + initGar = false; + + try { + Ignite ignite1 = startGrid(1); + Ignite ignite2 = startGrid(2); + + Class task = extLdr.loadClass(TASK_NAME); + + try { + ignite1.compute().execute(task, ignite2.cluster().localNode().id()); + + assert false; + } + catch (IgniteCheckedException e) { + info("Received expected exception: " + e); + } + } + finally { + stopGrid(1); + stopGrid(2); + } + } + + /** + * @throws Exception if error occur. + */ + @SuppressWarnings("unchecked") + private void checkGar() throws Exception { + initGar = true; + + String garDir = "modules/extdata/p2p/deploy"; + String garFileName = "p2p.gar"; + + File origGarPath = U.resolveGridGainPath(garDir + '/' + garFileName); + + File tmpPath = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); + + if (!tmpPath.mkdir()) + throw new IOException("Can not create temp directory"); + + try { + File newGarFile = new File(tmpPath, garFileName); + + U.copy(origGarPath, newGarFile, false); + + assert newGarFile.exists(); + + try { + garFile = "file:///" + tmpPath.getAbsolutePath(); + + try { + Ignite ignite1 = startGrid(1); + Ignite ignite2 = startGrid(2); + + Integer res = ignite1.compute().<UUID, Integer>execute(TASK_NAME, ignite2.cluster().localNode().id()); + + assert res != null; + } + finally { + stopGrid(1); + stopGrid(2); + } + } + finally { + if (newGarFile != null && !newGarFile.delete()) + error("Can not delete temp gar file"); + } + } + finally { + if (!tmpPath.delete()) + error("Can not delete temp directory"); + } + } + + /** + * Test GridDeploymentMode.ISOLATED mode. + * + * @throws Exception if error occur. + */ + public void testGarPrivateMode() throws Exception { + depMode = IgniteDeploymentMode.PRIVATE; + + checkGar(); + } + + /** + * Test GridDeploymentMode.ISOLATED mode. + * + * @throws Exception if error occur. + */ + public void testGarIsolatedMode() throws Exception { + depMode = IgniteDeploymentMode.ISOLATED; + + checkGar(); + } + + /** + * Test GridDeploymentMode.CONTINUOUS mode. + * + * @throws Exception if error occur. + */ + public void testGarContinuousMode() throws Exception { + depMode = IgniteDeploymentMode.CONTINUOUS; + + checkGar(); + } + + /** + * Test GridDeploymentMode.SHARED mode. + * + * @throws Exception if error occur. + */ + public void testGarSharedMode() throws Exception { + depMode = IgniteDeploymentMode.SHARED; + + checkGar(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java index 4474c49..3be6b29 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.deployment.uri; +import org.apache.ignite.util.antgar.*; import org.apache.tools.ant.*; -import org.gridgain.grid.util.antgar.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.config.*; import org.apache.ignite.testframework.junits.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java index 1b402ab..5456acd 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/bamboo/GridUriDeploymentTestSuite.java @@ -18,9 +18,9 @@ package org.apache.ignite.testsuites.bamboo; import junit.framework.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.p2p.*; import org.apache.ignite.testsuites.*; -import org.gridgain.grid.kernal.*; -import org.gridgain.grid.p2p.*; import org.apache.ignite.spi.deployment.uri.*; import org.apache.ignite.spi.deployment.uri.scanners.file.*; import org.apache.ignite.spi.deployment.uri.scanners.http.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java index 248c57d..61528b9 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.tools; +import org.apache.ignite.util.antgar.*; import org.apache.tools.ant.*; -import org.gridgain.grid.util.antgar.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.config.*; import org.apache.ignite.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java deleted file mode 100644 index c894e18..0000000 --- a/modules/urideploy/src/test/java/org/gridgain/grid/kernal/GridTaskUriDeploymentDeadlockSelfTest.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal; - -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.spi.deployment.uri.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.IgniteEventType.*; - -/** - * Test to reproduce gg-2852. - */ -public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); - - GridUriDeploymentSpi deploymentSpi = new GridUriDeploymentSpi(); - - deploymentSpi.setUriList( - Arrays.asList(U.resolveGridGainUrl("modules/core/src/test/resources/").toURI().toString())); - - if (gridName.endsWith("2")) { - // Delay deployment for 2nd grid only. - Field f = deploymentSpi.getClass().getDeclaredField("delayOnNewOrUpdatedFile"); - - f.setAccessible(true); - - f.set(deploymentSpi, true); - } - - c.setDeploymentSpi(deploymentSpi); - - return c; - } - - /** - * @throws Exception If failed. - */ - public void testDeadlock() throws Exception { - try { - Ignite g = startGrid(1); - - final CountDownLatch latch = new CountDownLatch(1); - - g.events().localListen(new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt.type() == EVT_NODE_JOINED; - - latch.countDown(); - - return true; - } - }, EVT_NODE_JOINED); - - IgniteFuture<?> f = multithreadedAsync(new Callable<Object>() { - @Override public Object call() throws Exception { - startGrid(2); - - return null; - } - }, 1); - - assert latch.await(5, SECONDS); - - info(">>> Starting task."); - - executeAsync(compute(g.cluster().forPredicate(F.equalTo(F.first(g.cluster().forRemotes().nodes())))), - "GridGarHelloWorldTask", "HELLOWORLD.MSG").get(60000); - - f.get(); - } - catch (Exception e) { - error("Test failed.", e); - - // With former version of GridDeploymentLocalStore test hangs forever. - // So, we need to forcibly exit. - // System.exit(1); - } - finally { - stopAllGrids(); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java deleted file mode 100644 index 5034620..0000000 --- a/modules/urideploy/src/test/java/org/gridgain/grid/p2p/GridP2PDisabledSelfTest.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.p2p; - -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.spi.deployment.uri.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.io.*; -import java.util.*; - -/** - * Test what happens if peer class loading is disabled. - * <p> - * In order for this test to run, make sure that your - * {@code p2p.uri.cls} folder ends with {@code .gar} extension. - */ -@SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown"}) -@GridCommonTest(group = "P2P") -public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { - /** Task name. */ - private static final String TASK_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; - - /** External class loader. */ - private static ClassLoader extLdr; - - /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ - private IgniteDeploymentMode depMode; - - /** */ - private boolean initGar; - - /** Path to GAR file. */ - private String garFile; - - /** - * - */ - public GridP2PDisabledSelfTest() { - super(/*start grid*/false); - } - - /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - extLdr = getExternalClassLoader(); - } - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setPeerClassLoadingEnabled(false); - - cfg.setDeploymentMode(depMode); - - if (initGar) { - GridUriDeploymentSpi depSpi = new GridUriDeploymentSpi(); - - depSpi.setUriList(Collections.singletonList(garFile)); - - cfg.setDeploymentSpi(depSpi); - } - - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500); - - return cfg; - } - - /** - * Test what happens if peer class loading is disabled. - * - * @throws Exception if error occur. - */ - @SuppressWarnings("unchecked") - private void checkClassNotFound() throws Exception { - initGar = false; - - try { - Ignite ignite1 = startGrid(1); - Ignite ignite2 = startGrid(2); - - Class task = extLdr.loadClass(TASK_NAME); - - try { - ignite1.compute().execute(task, ignite2.cluster().localNode().id()); - - assert false; - } - catch (IgniteCheckedException e) { - info("Received expected exception: " + e); - } - } - finally { - stopGrid(1); - stopGrid(2); - } - } - - /** - * @throws Exception if error occur. - */ - @SuppressWarnings("unchecked") - private void checkGar() throws Exception { - initGar = true; - - String garDir = "modules/extdata/p2p/deploy"; - String garFileName = "p2p.gar"; - - File origGarPath = U.resolveGridGainPath(garDir + '/' + garFileName); - - File tmpPath = new File(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); - - if (!tmpPath.mkdir()) - throw new IOException("Can not create temp directory"); - - try { - File newGarFile = new File(tmpPath, garFileName); - - U.copy(origGarPath, newGarFile, false); - - assert newGarFile.exists(); - - try { - garFile = "file:///" + tmpPath.getAbsolutePath(); - - try { - Ignite ignite1 = startGrid(1); - Ignite ignite2 = startGrid(2); - - Integer res = ignite1.compute().<UUID, Integer>execute(TASK_NAME, ignite2.cluster().localNode().id()); - - assert res != null; - } - finally { - stopGrid(1); - stopGrid(2); - } - } - finally { - if (newGarFile != null && !newGarFile.delete()) - error("Can not delete temp gar file"); - } - } - finally { - if (!tmpPath.delete()) - error("Can not delete temp directory"); - } - } - - /** - * Test GridDeploymentMode.ISOLATED mode. - * - * @throws Exception if error occur. - */ - public void testGarPrivateMode() throws Exception { - depMode = IgniteDeploymentMode.PRIVATE; - - checkGar(); - } - - /** - * Test GridDeploymentMode.ISOLATED mode. - * - * @throws Exception if error occur. - */ - public void testGarIsolatedMode() throws Exception { - depMode = IgniteDeploymentMode.ISOLATED; - - checkGar(); - } - - /** - * Test GridDeploymentMode.CONTINUOUS mode. - * - * @throws Exception if error occur. - */ - public void testGarContinuousMode() throws Exception { - depMode = IgniteDeploymentMode.CONTINUOUS; - - checkGar(); - } - - /** - * Test GridDeploymentMode.SHARED mode. - * - * @throws Exception if error occur. - */ - public void testGarSharedMode() throws Exception { - depMode = IgniteDeploymentMode.SHARED; - - checkGar(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala index a1f3f25..f3a2227 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala @@ -24,7 +24,6 @@ import org.apache.ignite.cluster.ClusterGroupEmptyException import java.util.{HashSet => JavaHashSet} import org.apache.ignite.visor.{VisorTag, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.VisorConsoleCommand import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala index 69241fc..1015a04 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala @@ -29,7 +29,6 @@ import java.util.UUID import java.util.concurrent.atomic._ import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index ae2eba0..92a5b46 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -30,7 +30,6 @@ import org.jetbrains.annotations._ import java.lang.{Boolean => JavaBoolean} import java.util.UUID -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import org.apache.ignite.visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala index 67a17bf..d1507cd 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala @@ -28,7 +28,6 @@ import org.apache.ignite.lang.IgniteBiTuple import java.lang.System._ import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala index 1ae70ea..4f189f2 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommand.scala @@ -29,7 +29,6 @@ import java.util.concurrent._ import org.apache.ignite.internal.util.typedef.internal.U import org.apache.ignite.visor.{VisorTag, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.VisorConsoleCommand import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala index 34acaeb..3f9dea0 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala @@ -29,7 +29,6 @@ import org.apache.ignite.events.IgniteEventType import org.apache.ignite.events.IgniteEventType._ import org.apache.ignite.visor.{VisorTag, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala index 93de9a3..24b9b94 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala @@ -30,7 +30,6 @@ import org.apache.ignite.events.IgniteEventType._ import java.util.UUID import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands._ import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala index 850351f..ef1a241 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala @@ -26,7 +26,6 @@ import java.lang.{Boolean => JavaBoolean} import java.util.{UUID, HashSet => JavaHashSet} import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala index 48a9cfe..b4b90e4 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala @@ -26,7 +26,6 @@ import org.apache.ignite.cluster.ClusterNode import java.util.{Collections, UUID} import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.VisorConsoleCommand import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala index 69c1b4f..8083ce9 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala @@ -30,7 +30,6 @@ import org.jetbrains.annotations._ import java.util.UUID -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala index a31c654..65545f0 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.ClusterNode import java.util.concurrent._ import org.apache.ignite.visor.{VisorTag, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala index e9c5d21..7f4ab1f 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala @@ -25,7 +25,6 @@ import java.util.concurrent._ import org.apache.ignite.internal.util.GridUtils import org.apache.ignite.internal.util.typedef.internal.U import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala index 113a7c8..be1b9f1 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala @@ -32,7 +32,6 @@ import org.apache.ignite.lang.IgniteUuid import java.util.UUID import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala index 0b9d85d..6049e13 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala @@ -30,7 +30,6 @@ import org.apache.ignite.lang.IgnitePredicate import java.net.{InetAddress, UnknownHostException} import org.apache.ignite.visor.VisorTag -import org.gridgain.visor._ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import visor.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala index ed2410f..733cfee 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala @@ -31,7 +31,6 @@ import org.jetbrains.annotations.Nullable import java.io.File import java.net._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.VisorConsoleCommand import visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 75a5a16..59a3e3e 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -28,7 +28,7 @@ import org.apache.ignite.cluster.{ClusterGroup, ClusterGroupEmptyException, Clus import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.events.IgniteEventType._ import org.apache.ignite.events.{IgniteDiscoveryEvent, IgniteEvent} -import org.apache.ignite.internal.GridComponentType._ +import org.apache.ignite.internal.IgniteComponentType._ import org.apache.ignite.internal.GridNodeAttributes._ import org.apache.ignite.internal.processors.spring.GridSpringProcessor import org.apache.ignite.internal.util.lang.{GridFunc => F} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ack/VisorAckCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ack/VisorAckCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ack/VisorAckCommandSpec.scala index 97ccfb7..6c6c829 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ack/VisorAckCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ack/VisorAckCommandSpec.scala @@ -18,7 +18,6 @@ package org.apache.ignite.visor.commands.ack import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.ack.VisorAckCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala index c919307..cf89e11 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala @@ -26,7 +26,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import java.util.regex.Pattern import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.alert.VisorAlertCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala index 660d1e8..14ce09e 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -22,7 +22,6 @@ import org.apache.ignite.cache.{GridCacheMode, GridCacheAtomicityMode} import GridCacheAtomicityMode._ import GridCacheMode._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.grid.cache._ import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration @@ -30,7 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.jetbrains.annotations.Nullable -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala index d92685e..c46b915 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala @@ -22,7 +22,6 @@ import org.apache.ignite.cache.query.GridCacheQuerySqlField import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala index d1d565f..e324474 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -21,7 +21,6 @@ import org.apache.ignite.cache.CacheConfiguration import org.apache.ignite.cache.GridCacheMode import GridCacheMode._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.grid.cache._ import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration @@ -29,7 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.jetbrains.annotations.Nullable -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala index c0ceb09..575728b 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala @@ -21,7 +21,6 @@ import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.events.IgniteEventType._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.config.VisorConfigurationCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 860558b..457852c 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -27,7 +27,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.jetbrains.annotations.Nullable -import org.gridgain.visor._ import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommandSpec.scala index e568800..6003119 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/deploy/VisorDeployCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.deploy import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.deploy.VisorDeployCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala index e93650c..8bf864b 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala @@ -21,7 +21,6 @@ import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.disco.VisorDiscoveryCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala index ea19949..26c8fb3 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.events import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.events.VisorEventsCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala index e6c3492..5e6f1c3 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.gc import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.gc.VisorGcCommand._ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/help/VisorHelpCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/help/VisorHelpCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/help/VisorHelpCommandSpec.scala index 5fca43a..b97cb85 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/help/VisorHelpCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/help/VisorHelpCommandSpec.scala @@ -17,11 +17,9 @@ package org.apache.ignite.visor.commands.help -import org.apache.ignite.visor.visor +import org.apache.ignite.visor._ import org.scalatest._ -import org.gridgain.visor._ - /** * Unit test for 'help' command. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/kill/VisorKillCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/kill/VisorKillCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/kill/VisorKillCommandSpec.scala index 36b1de4..43ef313 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/kill/VisorKillCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/kill/VisorKillCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.kill import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.kill.VisorKillCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/log/VisorLogCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/log/VisorLogCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/log/VisorLogCommandSpec.scala index afd807a..dcf7aae 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/log/VisorLogCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/log/VisorLogCommandSpec.scala @@ -20,8 +20,6 @@ package org.apache.ignite.visor.commands.log import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ - /** * Unit test for 'log' command. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/mem/VisorMemoryCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/mem/VisorMemoryCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/mem/VisorMemoryCommandSpec.scala index 02ca041..744d93b 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/mem/VisorMemoryCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/mem/VisorMemoryCommandSpec.scala @@ -20,8 +20,6 @@ package org.apache.ignite.visor.commands.mem import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ - /** * Unit test for memory commands. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala index b434cec..992ff7f 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/node/VisorNodeCommandSpec.scala @@ -18,7 +18,6 @@ package org.apache.ignite.visor.commands.node import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.node.VisorNodeCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala index 0f5bb4a..ada6341 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/open/VisorOpenCommandSpec.scala @@ -20,8 +20,6 @@ package org.apache.ignite.visor.commands.open import org.apache.ignite.IgniteCheckedException import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ - /** * Unit test for 'open' command. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala index b54a96f..dde5f18 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/ping/VisorPingCommandSpec.scala @@ -18,7 +18,6 @@ package org.apache.ignite.visor.commands.ping import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.ping.VisorPingCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala index 7611a31..1a451c4 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/start/VisorStartCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.start import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.start.VisorStartCommand._ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala index c048bd3..ae3b71c 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala @@ -27,7 +27,6 @@ import org.scalatest._ import java.util -import org.gridgain.visor._ import org.apache.ignite.visor.commands.tasks.VisorTasksCommand._ import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala index 05a0d47..3a3b6e5 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommandSpec.scala @@ -18,7 +18,6 @@ package org.apache.ignite.visor.commands.top import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} -import org.gridgain.visor._ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/172bc7ac/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala index b1a2877..969fb94 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommandSpec.scala @@ -20,7 +20,6 @@ package org.apache.ignite.visor.commands.vvm import org.apache.ignite.visor.visor import org.scalatest._ -import org.gridgain.visor._ import org.apache.ignite.visor.commands.vvm.VisorVvmCommand._ /**
