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:04:28 UTC
svn commit: r1136731 - in /hadoop/common/branches/branch-0.20-security-204:
.eclipse.templates/.classpath
.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
.eclipse.templates/.project CHANGES.txt build.xml
Author: omalley
Date: Thu Jun 16 23:04:27 2011
New Revision: 1136731
URL: http://svn.apache.org/viewvc?rev=1136731&view=rev
Log:
HADOOP-7248. Update eclipse target to generate .classpath from ivy config.
(Thomas Graves and Tom White via cdouglas)
Removed:
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.classpath
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch
hadoop/common/branches/branch-0.20-security-204/.eclipse.templates/.project
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=1136731&r1=1136730&r2=1136731&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:04:27 2011
@@ -23,6 +23,9 @@ Release 0.20.204.0 - unreleased
HDFS-2044. TestQueueProcessingStatistics failing automatic test due to
timing issues. (mattf)
+ HADOOP-7248. Update eclipse target to generate .classpath from ivy config.
+ (Thomas Graves and Tom White via cdouglas)
+
MAPREDUCE-2558. Add queue-level metrics 0.20-security branch - test fix
(jeffrey nasbit via mahadev)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 23:04:27 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,1102378,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,1101729,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=1136731&r1=1136730&r2=1136731&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:04:27 2011
@@ -259,6 +259,17 @@
<property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
<available property="clover.present" file="${clover.jar}" />
+
+ <!-- Eclipse properties -->
+ <property name="build.dir.eclipse" value="build/eclipse"/>
+ <property name="build.dir.eclipse-main-classes" value="${build.dir.eclipse}/classes-main"/>
+ <property name="build.dir.eclipse-test-classes" value="${build.dir.eclipse}/classes-test"/>
+ <property name="build.dir.eclipse-test-generated-classes" value="${build.dir.eclipse}/classes-test-generated"/>
+ <property name="build.dir.eclipse-example-classes" value="${build.dir.eclipse}/classes-example"/>
+ <property name="build.dir.eclipse-tools-classes" value="${build.dir.eclipse}/classes-tools"/>
+ <property name="build.dir.eclipse-contrib-classes" value="${build.dir.eclipse}/classes-contrib"/>
+ <property name="build.dir.eclipse-test-resources" value="${build.dir.eclipse}/test-resources/"/>
+ <property name="build.dir.eclipse-test-resources-webapps" value="${build.dir.eclipse}/test-resources/webapps"/>
<!-- check if clover reports should be generated -->
<condition property="clover.enabled">
@@ -287,6 +298,13 @@
<path refid="ivy-common.classpath"/>
</path>
+ <path id="test.lib.classpath">
+ <fileset dir="${test.lib.dir}">
+ <include name="**/*.jar"/>
+ <exclude name="**/excluded/"/>
+ </fileset>
+ </path>
+
<!-- the unit test classpath: uses test.src.dir for configuration -->
<path id="test.classpath">
<pathelement location="${test.build.extraconf}"/>
@@ -296,10 +314,7 @@
<pathelement location="${build.examples}"/>
<pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/>
- <fileset dir="${test.lib.dir}">
- <include name="**/*.jar"/>
- <exclude name="**/excluded/"/>
- </fileset>
+ <path refid="test.lib.classpath"/>
<path refid="classpath"/>
</path>
@@ -439,6 +454,9 @@
</target>
<target name="compile-mapred-classes" depends="compile-core-classes,compile-hdfs-classes">
+ <taskdef classname="org.apache.jasper.JspC" name="jsp-compile" >
+ <classpath refid="classpath"/>
+ </taskdef>
<jsp-compile
uriroot="${src.webapps}/task"
outputdir="${build.src}"
@@ -2217,7 +2235,7 @@
<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="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" />
@@ -2226,12 +2244,17 @@
</eclipse>
<copy todir="." overwrite="true">
<fileset dir=".eclipse.templates">
- <exclude name="**/README.txt"/>
+ <exclude name="**/README.txt"/>
</fileset>
<filterset>
<filter token="PROJECT" value="${eclipse.project}"/>
</filterset>
</copy>
+ <!-- copy all of the jsp and static files -->
+ <copy todir="${build.dir.eclipse-test-resources-webapps}">
+ <fileset dir="${build.webapps}">
+ </fileset>
+ </copy>
</target>
<target name="ivy-init-dirs">
@@ -2340,7 +2363,7 @@
description="Retrieve Ivy-managed artifacts for the test configurations">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"/>
- <ivy:cachepath pathid="test.classpath" conf="test"/>
+ <ivy:cachepath pathid="ivy-test.classpath" conf="test"/>
</target>
<target name="ivy-retrieve-common" depends="ivy-resolve-common"