Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8AD673F58 for ; Wed, 4 May 2011 06:23:48 +0000 (UTC) Received: (qmail 56298 invoked by uid 500); 4 May 2011 06:23:47 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 56262 invoked by uid 500); 4 May 2011 06:23:47 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 56254 invoked by uid 99); 4 May 2011 06:23:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2011 06:23:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2011 06:23:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB0FE2388901; Wed, 4 May 2011 06:23:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1099333 - in /hadoop/common/branches/branch-0.20-security-203: ./ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/ src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/ Date: Wed, 04 May 2011 06:23:22 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110504062322.EB0FE2388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Wed May 4 06:23:22 2011 New Revision: 1099333 URL: http://svn.apache.org/viewvc?rev=1099333&view=rev Log: MAPREDUCE-1280. Update Eclipse plugin to the new eclipse.jdt API. (Alex Kozlov via szetszwo) Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1099333&r1=1099332&r2=1099333&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Wed May 4 06:23:22 2011 @@ -2,6 +2,9 @@ Hadoop Change Log 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) Modified: hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java?rev=1099333&r1=1099332&r2=1099333&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java (original) +++ hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java Wed May 4 06:23:22 2011 @@ -32,7 +32,7 @@ import org.eclipse.debug.core.ILaunchCon 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 @@ public class HadoopApplicationLaunchShor // 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 { /* Modified: hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java?rev=1099333&r1=1099332&r2=1099333&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java (original) +++ hadoop/common/branches/branch-0.20-security-203/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java Wed May 4 06:23:22 2011 @@ -159,9 +159,9 @@ public class RunOnHadoopWizard extends W // 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();