You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/06/17 01:02:40 UTC
svn commit: r1136730 - in /hadoop/common/branches/branch-0.20-security-204:
./ .eclipse.templates/.launches/
Author: omalley
Date: Thu Jun 16 23:02:39 2011
New Revision: 1136730
URL: http://svn.apache.org/viewvc?rev=1136730&view=rev
Log:
HADOOP-7277. Add generation of run configurations to eclipse target.
(Jeffrey Naisbitt and Philip Zeyliger via cdouglas)
Added:
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/
- copied from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/AllTests.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/AllTests.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/DataNode.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/DataNode.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/JobTracker.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/JobTracker.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/NameNode.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/NameNode.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/SpecificTestTemplate.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/SpecificTestTemplate.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.launches/TaskTracker.launch
- copied unchanged from r1102378, hadoop/common/branches/branch-0.20-security/.eclipse.templates/.launches/TaskTracker.launch
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/build.xml
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136730&r1=1136729&r2=1136730&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 23:02:39 2011
@@ -29,6 +29,9 @@ Release 0.20.204.0 - unreleased
HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to
something other than build/test. (Thomas Graves via mahadev)
+ HADOOP-7277. Add generation of run configurations to eclipse target.
+ (Jeffrey Naisbitt and Philip Zeyliger via cdouglas)
+
HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
trying to use the wrong bin directory. (omalley)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 23:02:39 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1102378,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1132788,1133133,1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-204/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/build.xml?rev=1136730&r1=1136729&r2=1136730&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-204/build.xml Thu Jun 16 23:02:39 2011
@@ -275,11 +275,15 @@
<!-- the normal classpath -->
<path id="classpath">
<pathelement location="${build.classes}"/>
+ <path refid="src.lib.classpath"/>
+ <pathelement location="${conf.dir}"/>
+ </path>
+
+ <path id="src.lib.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
<exclude name="**/excluded/" />
</fileset>
- <pathelement location="${conf.dir}"/>
<path refid="ivy-common.classpath"/>
</path>
@@ -2138,12 +2142,88 @@
</exec>
</target>
- <target name="eclipse-files" depends="init"
- description="Generate files for Eclipse">
- <pathconvert property="eclipse.project">
- <path path="${basedir}"/>
- <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
- </pathconvert>
+ <condition property="ant-eclipse.jar.exists">
+ <available file="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar"/>
+ </condition>
+
+ <target name="ant-eclipse-download" unless="ant-eclipse.jar.exists"
+ description="Downloads the ant-eclipse binary.">
+ <get src="http://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
+ dest="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
+
+ <untar src="${build.dir}/ant-eclipse-1.0.bin.tar.bz2"
+ dest="${build.dir}" compression="bzip2">
+ <patternset>
+ <include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
+ </patternset>
+ </untar>
+ <delete file="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" />
+ </target>
+
+ <target name="eclipse"
+ depends="init,ant-eclipse-download,ivy-retrieve-common,ivy-retrieve-test,compile-core-test"
+ description="Create eclipse project files">
+ <pathconvert property="eclipse.project">
+ <path path="${basedir}"/>
+ <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
+ </pathconvert>
+ <taskdef name="eclipse"
+ classname="prantl.ant.eclipse.EclipseTask"
+ classpath="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar" />
+ <eclipse updatealways="true">
+ <project name="${eclipse.project}" />
+ <classpath>
+ <source path="${src.dir}/core"
+ output="${build.dir.eclipse-main-classes}" />
+ <source path="${src.dir}/hdfs"
+ output="${build.dir.eclipse-main-classes}" />
+ <source path="${src.dir}/mapred"
+ output="${build.dir.eclipse-main-classes}" />
+ <source path="${test.src.dir}/"
+ output="${build.dir.eclipse-test-classes}"
+ excluding="aop/|mapred/|system/|bin/|ddl/|lib/|tools/"/>
+ <source path="${test.src.dir}/aop"
+ output="${build.dir.eclipse-test-classes}" />
+ <source path="${test.generated.dir}"
+ output="${build.dir.eclipse-test-generated-classes}" />
+ <source path="${tools.src}"
+ output="${build.dir.eclipse-tools-classes}" />
+ <source path="${examples.dir}"
+ output="${build.dir.eclipse-example-classes}" />
+ <source path="${contrib.dir}/data_join/src/examples"
+ output="${build.dir.eclipse-contrib-classes}/data_join/examples" />
+ <source path="${contrib.dir}/data_join/src/test"
+ output="${build.dir.eclipse-contrib-classes}/data_join/test" />
+ <source path="${contrib.dir}/data_join/src/java"
+ output="${build.dir.eclipse-contrib-classes}/data_join/java" />
+ <source path="${contrib.dir}/streaming/src/java"
+ output="${build.dir.eclipse-contrib-classes}/streaming/main" />
+ <source path="${contrib.dir}/streaming/src/test"
+ output="${build.dir.eclipse-contrib-classes}/streaming/test"
+ excluding="system/"/>
+ <source path="${contrib.dir}/vaidya/src/java"
+ output="${build.dir.eclipse-contrib-classes}/vaidya/main" />
+ <source path="${contrib.dir}/fairscheduler/src/java"
+ output="${build.dir.eclipse-contrib-classes}/fairscheduler/main" />
+ <source path="${contrib.dir}/fairscheduler/src/test"
+ output="${build.dir.eclipse-contrib-classes}/fairscheduler/test" />
+ <source path="${contrib.dir}/gridmix/src/java"
+ output="${build.dir.eclipse-contrib-classes}/gridmix/main" />
+ <source path="${contrib.dir}/gridmix/src/test"
+ output="${build.dir.eclipse-contrib-classes}/gridmix/test"
+ excluding="system/"/>
+ <source path="${contrib.dir}/capacity-scheduler/src/java"
+ output="${build.dir.eclipse-contrib-classes}/capacity-scheduler/main" />
+ <source path="${contrib.dir}/capacity-scheduler/src/test"
+ output="${build.dir.eclipse-contrib-classes}/capacity-scheduler/test" />
+ <output path="${build.dir.eclipse-main-classes}" />
+ <library pathref="src.lib.classpath" exported="false" />
+ <library pathref="test.lib.classpath" exported="false" />
+ <variable path="ANT_HOME/lib/ant.jar" exported="false" />
+ <library path="${conf.dir}" exported="false" />
+ <library path="${build.dir.eclipse-test-resources}" exported="false" />
+ </classpath>
+ </eclipse>
<copy todir="." overwrite="true">
<fileset dir=".eclipse.templates">
<exclude name="**/README.txt"/>