MAPREDUCE-1280. Update Eclipse plugin to the new eclipse.jdt API.
(Alex Kozlov via szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-203@1099333 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index ffd635d..1df6ffa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,9 @@
Release 0.20.203.0 - unreleased
+ MAPREDUCE-1280. Update Eclipse plugin to the new eclipse.jdt API.
+ (Alex Kozlov via szetszwo)
+
HADOOP-7259. Contrib modules should include the build.properties from
the enclosing hadoop directory. (omalley)
diff --git a/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java b/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java
index 3297c64..0d9e546 100644
--- a/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java
+++ b/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java
@@ -32,7 +32,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaApplicationLaunchShortcut;
+import org.eclipse.jdt.debug.ui.launchConfigurations.JavaApplicationLaunchShortcut;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
@@ -64,7 +64,7 @@
// Find an existing or create a launch configuration (Standard way)
ILaunchConfiguration iConf =
super.findLaunchConfiguration(type, configType);
-
+ if (iConf == null) iConf = super.createConfiguration(type);
ILaunchConfigurationWorkingCopy iConfWC;
try {
/*
diff --git a/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java b/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
index a080510..04eb4bf 100644
--- a/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
+++ b/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java
@@ -159,9 +159,9 @@
// Write it to the disk file
try {
- // File confFile = File.createTempFile("hadoop-site-", ".xml",
+ // File confFile = File.createTempFile("core-site-", ".xml",
// confDir);
- File confFile = new File(confDir, "hadoop-site.xml");
+ File confFile = new File(confDir, "core-site.xml");
FileOutputStream fos = new FileOutputStream(confFile);
conf.writeXml(fos);
fos.close();
