Ignite-67 GridHadoopSetup properties fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a8fb6676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a8fb6676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a8fb6676 Branch: refs/heads/sprint-1 Commit: a8fb6676f67ecd3e99efd03339396fd145496abf Parents: 4b2c566 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 16:38:46 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 16:38:46 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/hadoop/GridHadoopSetup.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8fb6676/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java index 024d73d..66343ba 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java @@ -36,9 +36,9 @@ public class GridHadoopSetup { public static final String WINUTILS_EXE = "winutils.exe"; /** */ - private static final FilenameFilter GRIDGAIN_JARS = new FilenameFilter() { + private static final FilenameFilter IGNITE_JARS = new FilenameFilter() { @Override public boolean accept(File dir, String name) { - return name.startsWith("gridgain-") && name.endsWith(".jar"); + return name.startsWith("ignite-") && name.endsWith(".jar"); } }; @@ -195,7 +195,7 @@ public class GridHadoopSetup { if (!jarsLinksCorrect) { if (ask("GridGain JAR files are not found in Hadoop 'lib' directory. " + "Create appropriate symbolic links?")) { - File[] oldGridGainJarFiles = hadoopCommonLibDir.listFiles(GRIDGAIN_JARS); + File[] oldGridGainJarFiles = hadoopCommonLibDir.listFiles(IGNITE_JARS); if (oldGridGainJarFiles.length > 0 && ask("The Hadoop 'lib' directory contains JARs from other GridGain " + "installation. They must be deleted to continue. Continue?")) { @@ -271,7 +271,7 @@ public class GridHadoopSetup { if (!folder.exists()) exit("Folder '" + folder.getAbsolutePath() + "' is not found.", null); - jarFiles.addAll(Arrays.asList(folder.listFiles(GRIDGAIN_JARS))); + jarFiles.addAll(Arrays.asList(folder.listFiles(IGNITE_JARS))); } /**
