Author: shv
Date: Sat Apr 18 00:52:40 2009
New Revision: 766190
URL: http://svn.apache.org/viewvc?rev=766190&view=rev
Log:
HADOOP-5658. Fix Eclipse templates. Contributed by Philip Zeyliger.
Modified:
hadoop/core/trunk/.eclipse.templates/.classpath
hadoop/core/trunk/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
hadoop/core/trunk/CHANGES.txt
Modified: hadoop/core/trunk/.eclipse.templates/.classpath
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/.eclipse.templates/.classpath?rev=766190&r1=766189&r2=766190&view=diff
==============================================================================
--- hadoop/core/trunk/.eclipse.templates/.classpath (original)
+++ hadoop/core/trunk/.eclipse.templates/.classpath Sat Apr 18 00:52:40 2009
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/benchmarks"/>
+ <classpathentry excluding="gridmix2/src/java/" kind="src"
path="src/benchmarks"/>
+ <classpathentry kind="src" path="src/benchmarks/gridmix2/src/java"/>
<classpathentry kind="src" path="src/core"/>
<classpathentry kind="src" path="src/examples"/>
<classpathentry kind="src" path="src/hdfs"/>
@@ -16,8 +17,8 @@
<classpathentry kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/kfs-0.2.2.jar"/>
- <classpathentry kind="lib" path="lib/jsp-2.1/jsp-2.1.jar"/>
- <classpathentry kind="lib" path="lib/jsp-2.1/jsp-api-2.1.jar"/>
+ <classpathentry kind="lib" path="lib/jsp-2.1/jsp-2.1.jar"/>
+ <classpathentry kind="lib" path="lib/jsp-2.1/jsp-api-2.1.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/commons-codec-1.3.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>
@@ -30,10 +31,10 @@
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/junit-4.5.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/log4j-1.2.15.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/oro-2.0.8.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jetty-6.1.14.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jetty-util-6.1.14.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/servlet-api-2.5-6.1.14.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/core-3.1.1.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jetty-6.1.14.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jetty-util-6.1.14.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/servlet-api-2.5-6.1.14.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/core-3.1.1.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/slf4j-api-1.4.3.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/slf4j-log4j12-1.4.3.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/xmlenc-0.52.jar"/>
@@ -42,5 +43,7 @@
<classpathentry kind="lib"
path="src/test/lib/ftpserver-server-1.0.0-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="src/test/lib/mina-core-2.0.0-M2-20080407.124109-12.jar"/>
<classpathentry kind="lib" path="build/test/classes"/>
+ <classpathentry kind="lib" path="build/classes"/>
+ <classpathentry kind="lib" path="conf"/>
<classpathentry kind="output" path="build/eclipse-classes"/>
</classpath>
Modified:
hadoop/core/trunk/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch?rev=766190&r1=766189&r2=766190&view=diff
==============================================================================
---
hadoop/core/trunk/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
(original)
+++
hadoop/core/trunk/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
Sat Apr 18 00:52:40 2009
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS"
value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS"
value="compile,compile-core-test,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS"
value="compile-core-test,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS"
value="clean,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS"
value="compile-core-test,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE"
value="${project}"/>
@@ -15,8 +16,12 @@
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND"
value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="true"/>
+<!-- Use Java 1.6 for ant; Eclipse may be running on 1.5. -->
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER"
value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="@PROJECT@"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${workspace_loc:/@PROJECT@/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS"
value="full,incremental,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS"
value="full,incremental,clean"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED"
value="true"/>
+<stringAttribute key="process_factory_id"
value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=766190&r1=766189&r2=766190&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Sat Apr 18 00:52:40 2009
@@ -1282,6 +1282,7 @@
HADOOP-5691. Makes org.apache.hadoop.mapreduce.Reducer concrete class
instead of abstract. (Amareshwari Sriramadasu via sharad)
+ HADOOP-5658. Fix Eclipse templates. (Philip Zeyliger via shv)
Release 0.19.2 - Unreleased
