# sprint-1 Fixed class names
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9b49abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9b49abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9b49abf Branch: refs/heads/ignite-86 Commit: f9b49abf50b73beefc0a01a128849e0a3dd6a79a Parents: e0ba6a3 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 26 10:04:20 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 26 10:04:20 2015 +0300 ---------------------------------------------------------------------- .../GridP2PDifferentClassLoaderSelfTest.java | 4 +- .../p2p/GridP2PHotRedeploymentSelfTest.java | 2 +- .../ignite/p2p/GridP2PNodeLeftSelfTest.java | 2 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +- modules/extdata/p2p/META-INF/gridgain.xml | 2 +- .../tests/p2p/GridP2PTestTaskExternalPath2.java | 137 ------------------- .../tests/p2p/P2PTestTaskExternalPath2.java | 137 +++++++++++++++++++ .../deployment/uri/META-INF/p2p-gridgain.xml | 2 +- 8 files changed, 145 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java index 9f06da3..3c06a18 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDifferentClassLoaderSelfTest.java @@ -33,12 +33,12 @@ public class GridP2PDifferentClassLoaderSelfTest extends GridCommonAbstractTest /** * Class Name of task 1. */ - private static final String TEST_TASK1_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; + private static final String TEST_TASK1_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; /** * Class Name of task 2. */ - private static final String TEST_TASK2_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath2"; + private static final String TEST_TASK2_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2"; /** * URL of classes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java index d2ea41d..cf17ebd 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PHotRedeploymentSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; @GridCommonTest(group = "P2P") public class GridP2PHotRedeploymentSelfTest extends GridCommonAbstractTest { /** Task name. */ - private static final String TASK_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; + private static final String TASK_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; /** Current deployment mode. Used in {@link #getConfiguration(String)}. */ private IgniteDeploymentMode depMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java index 9d1f1e7..ae718cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PNodeLeftSelfTest.java @@ -73,7 +73,7 @@ public class GridP2PNodeLeftSelfTest extends GridCommonAbstractTest { Ignite ignite2 = startGrid(2); Ignite ignite3 = startGrid(3); - Class task1 = urlClsLdr1.loadClass("org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"); + Class task1 = urlClsLdr1.loadClass("org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"); Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java index 0ce5b56..44d9888 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java @@ -32,10 +32,10 @@ import java.net.*; @GridCommonTest(group = "P2P") public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest { /** Class Name of task 1. */ - private static final String TEST_TASK1_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; + private static final String TEST_TASK1_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; /** Class Name of task 2. */ - private static final String TEST_TASK2_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath2"; + private static final String TEST_TASK2_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2"; /** */ private static final ClassLoader CLASS_LOADER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/extdata/p2p/META-INF/gridgain.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/META-INF/gridgain.xml b/modules/extdata/p2p/META-INF/gridgain.xml index 6ff181c..27f0809 100644 --- a/modules/extdata/p2p/META-INF/gridgain.xml +++ b/modules/extdata/p2p/META-INF/gridgain.xml @@ -34,7 +34,7 @@ --> <util:list id="tasks"> <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value> - <value>org.apache.ignite.tests.p2p.GridP2PTestTaskExternalPath2</value> + <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2</value> <value>org.apache.ignite.tests.p2p.SingleSplitTestTask</value> </util:list> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PTestTaskExternalPath2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PTestTaskExternalPath2.java deleted file mode 100644 index 5d0fa3a..0000000 --- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PTestTaskExternalPath2.java +++ /dev/null @@ -1,137 +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.apache.ignite.tests.p2p; - -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.util.*; - -/** - * Simple test task. - */ -public class GridP2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer> { - /** */ - @IgniteLoggerResource - private IgniteLogger log; - - /** - * {@inheritDoc} - */ - @SuppressWarnings({"unchecked"}) - @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException { - if (log.isInfoEnabled()) { - log.info("Mapping [task=" + this + ", subgrid=" + F.viewReadOnly(subgrid, F.node2id()) + - ", arg=" + arg + ']'); - } - - Set<UUID> nodeIds; - - boolean sleep; - - if (arg instanceof Object[]) { - nodeIds = Collections.singleton((UUID)(((Object[])arg)[0])); - - sleep = (Boolean)((Object[])arg)[1]; - } - else if (arg instanceof List) { - nodeIds = new HashSet<>((Collection<UUID>)arg); - - sleep = false; - } - else { - nodeIds = Collections.singleton((UUID)arg); - - sleep = false; - } - - Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); - - for (ClusterNode node : subgrid) { - if (nodeIds.contains(node.id())) - jobs.put(new TestJob(node.id(), sleep), node); - } - - if (!jobs.isEmpty()) - return jobs; - - throw new IgniteCheckedException("Failed to find target node: " + arg); - } - - /** - * {@inheritDoc} - */ - @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { - return results.get(0).getData(); - } - - /** - * Simple job class - */ - @SuppressWarnings("PublicInnerClass") - public static class TestJob extends ComputeJobAdapter { - /** Ignite instance. */ - @IgniteInstanceResource - private Ignite ignite; - - /** Task session. */ - @IgniteTaskSessionResource - private ComputeTaskSession ses; - - /** */ - @IgniteLoggerResource - private IgniteLogger log; - - /** */ - private boolean sleep; - - /** - * @param nodeId Node ID for node this job is supposed to execute on. - * @param sleep Sleep flag. - */ - public TestJob(UUID nodeId, boolean sleep) { - super(nodeId); - - this.sleep = sleep; - } - - /** - * {@inheritDoc} - */ - @Override public Integer execute() throws IgniteCheckedException { - assert ignite.configuration().getNodeId().equals(argument(0)); - - if (sleep) { - try { - Thread.sleep(Long.MAX_VALUE); - } - catch (InterruptedException e) { - log.info("Job has been cancelled. Caught exception: " + e); - - Thread.currentThread().interrupt(); - } - } - - return System.identityHashCode(ses.getClassLoader()); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java new file mode 100644 index 0000000..7f75052 --- /dev/null +++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/P2PTestTaskExternalPath2.java @@ -0,0 +1,137 @@ +/* + * 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.tests.p2p; + +import org.apache.ignite.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.compute.*; +import org.apache.ignite.resources.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; + +import java.util.*; + +/** + * Simple test task. + */ +public class P2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, Integer> { + /** */ + @IgniteLoggerResource + private IgniteLogger log; + + /** + * {@inheritDoc} + */ + @SuppressWarnings({"unchecked"}) + @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException { + if (log.isInfoEnabled()) { + log.info("Mapping [task=" + this + ", subgrid=" + F.viewReadOnly(subgrid, F.node2id()) + + ", arg=" + arg + ']'); + } + + Set<UUID> nodeIds; + + boolean sleep; + + if (arg instanceof Object[]) { + nodeIds = Collections.singleton((UUID)(((Object[])arg)[0])); + + sleep = (Boolean)((Object[])arg)[1]; + } + else if (arg instanceof List) { + nodeIds = new HashSet<>((Collection<UUID>)arg); + + sleep = false; + } + else { + nodeIds = Collections.singleton((UUID)arg); + + sleep = false; + } + + Map<TestJob, ClusterNode> jobs = U.newHashMap(subgrid.size()); + + for (ClusterNode node : subgrid) { + if (nodeIds.contains(node.id())) + jobs.put(new TestJob(node.id(), sleep), node); + } + + if (!jobs.isEmpty()) + return jobs; + + throw new IgniteCheckedException("Failed to find target node: " + arg); + } + + /** + * {@inheritDoc} + */ + @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException { + return results.get(0).getData(); + } + + /** + * Simple job class + */ + @SuppressWarnings("PublicInnerClass") + public static class TestJob extends ComputeJobAdapter { + /** Ignite instance. */ + @IgniteInstanceResource + private Ignite ignite; + + /** Task session. */ + @IgniteTaskSessionResource + private ComputeTaskSession ses; + + /** */ + @IgniteLoggerResource + private IgniteLogger log; + + /** */ + private boolean sleep; + + /** + * @param nodeId Node ID for node this job is supposed to execute on. + * @param sleep Sleep flag. + */ + public TestJob(UUID nodeId, boolean sleep) { + super(nodeId); + + this.sleep = sleep; + } + + /** + * {@inheritDoc} + */ + @Override public Integer execute() throws IgniteCheckedException { + assert ignite.configuration().getNodeId().equals(argument(0)); + + if (sleep) { + try { + Thread.sleep(Long.MAX_VALUE); + } + catch (InterruptedException e) { + log.info("Job has been cancelled. Caught exception: " + e); + + Thread.currentThread().interrupt(); + } + } + + return System.identityHashCode(ses.getClassLoader()); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9b49abf/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-gridgain.xml ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-gridgain.xml b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-gridgain.xml index aecb7d5..958f26e 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-gridgain.xml +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF/p2p-gridgain.xml @@ -37,6 +37,6 @@ --> <util:list id="tasks"> <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1</value> - <value>org.apache.ignite.tests.p2p.GridP2PTestTaskExternalPath2</value> + <value>org.apache.ignite.tests.p2p.P2PTestTaskExternalPath2</value> </util:list> </beans>
