You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/10 11:52:55 UTC
[2/4] incubator-ignite git commit: # Ignite Fixed class names
# Ignite 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/99ee7a70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99ee7a70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99ee7a70
Branch: refs/heads/ignite-21
Commit: 99ee7a70110a4551df335c34b5f4c748518c9bdf
Parents: 20872dc
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 10 13:40:00 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 10 13:40:00 2014 +0300
----------------------------------------------------------------------
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
modules/core/src/test/config/tests.properties | 2 +-
...loymentClassLoaderMultiThreadedSelfTest.java | 4 ++--
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../file/GridFileDeploymentSelfTest.java | 24 ++++++++++----------
.../GridFileDeploymentUndeploySelfTest.java | 4 ++--
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
index 78b251c..df035de 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.*;
* Gridgain provides the following {@code GridDeploymentSpi} implementations:
* <ul>
* <li>{@link org.apache.ignite.spi.deployment.local.LocalDeploymentSpi}</li>
- * <li>{@gglink org.gridgain.grid.spi.deployment.uri.GridUriDeploymentSpi}</li>
+ * <li>{@gglink org.apache.ignite.spi.deployment.uri.GridUriDeploymentSpi}</li>
* </ul>
* <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
* internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/core/src/test/config/tests.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties
index 09d2711..f093d27 100644
--- a/modules/core/src/test/config/tests.properties
+++ b/modules/core/src/test/config/tests.properties
@@ -52,7 +52,7 @@ deploy.uri.http=http://216.93.179.140/gridgain/gg-test/deployment/
# Http scanner URI for secure SSL HTTPs deployment.
deploy.uri.https=https://216.93.179.140:8445/gridgain/gg-test/deployment/
# Directory with descriptors to construct GAR files.
-deploy.gar.descriptor.dir=modules/urideploy/src/test/java/org/gridgain/grid/spi/deployment/uri/META-INF
+deploy.gar.descriptor.dir=modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/META-INF
# Directory with a number of descriptors for the Ant gar task.
ant.gar.descriptor.dir=modules/extdata/p2p/META-INF
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
index 90c664d..83d483e 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderMultiThreadedSelfTest.java
@@ -40,7 +40,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo
multithreaded(
new Callable<Object>() {
@Nullable @Override public Object call() throws Exception {
- ldr.loadClass("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ ldr.loadClass("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
return null;
}
@@ -55,7 +55,7 @@ public class GridUriDeploymentClassLoaderMultiThreadedSelfTest extends GridCommo
multithreaded(
new Callable<Object>() {
@Nullable @Override public Object call() throws Exception {
- ldr0.loadClassGarOnly("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ ldr0.loadClassGarOnly("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/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 bff2278..8359793 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
@@ -27,7 +27,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs
*/
public void testTaskCorrect() throws Exception {
proceedTest("correct.gar", "gridgain.xml",
- "org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0", true);
+ "org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0", true);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
index ebfae24..6b6d0f7 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java
@@ -23,7 +23,7 @@ public class GridUriDeploymentMultiScannersSelfTest extends GridUriDeploymentAbs
* @throws Exception If failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
index e8b7e4a..0009e2e 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java
@@ -33,7 +33,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDeploymentFromFolder() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask0");
checkTask("GridUriDeploymentTestWithNameTask0");
}
@@ -43,7 +43,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDeploymentFromFile() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}
@@ -60,7 +60,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testNoDescriptorDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask4");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask4");
checkTask("GridUriDeploymentTestWithNameTask4");
}
@@ -75,10 +75,10 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testBadDeployment() throws Exception {
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridInnerTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask");
- checkNoTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentAbstractTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridInnerTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentInterfaceTestTask");
+ checkNoTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentNonePublicTestTask");
}
/**
@@ -95,7 +95,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testDependenceDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask1");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask1");
}
/**
@@ -112,7 +112,7 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testNoDescriptorDependenceDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask2");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask2");
}
/**
@@ -130,12 +130,12 @@ public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception If failed.
*/
public void testSignedDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask5");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask5");
checkTask("GridUriDeploymentTestWithNameTask5");
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask6") == null :
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask6") == null :
"Task from GAR with invalid signature should not be deployed.";
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6")
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask6")
== null : "Task from GAR with invalid signature should not be deployed.";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
index 9ed0cc7..51b4c8f 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java
@@ -63,7 +63,7 @@ public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<Grid
Thread.sleep(GridUriDeploymentSpi.DFLT_DISK_SCAN_FREQUENCY + 3000);
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") != null :
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") != null :
"Failed to find resource for added GAR file.";
assert getSpi().findResource("GridUriDeploymentTestWithNameTask3") != null;
@@ -75,7 +75,7 @@ public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<Grid
Thread.sleep(GridUriDeploymentSpi.DFLT_DISK_SCAN_FREQUENCY + 3000);
- assert getSpi().findResource("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") == null;
+ assert getSpi().findResource("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3") == null;
assert getSpi().findResource("GridUriDeploymentTestWithNameTask3") == null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
index 1309216..8b57126 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java
@@ -23,7 +23,7 @@ public class GridFtpDeploymentTest extends GridUriDeploymentAbstractSelfTest {
* @throws Exception If failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99ee7a70/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
index 27a91b4..6301925 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java
@@ -65,7 +65,7 @@ public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTes
* @throws Exception if failed.
*/
public void testDeployment() throws Exception {
- checkTask("org.gridgain.grid.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
+ checkTask("org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestTask3");
checkTask("GridUriDeploymentTestWithNameTask3");
}