hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r671563 - in /hadoop/core/trunk: .eclipse.templates/.classpath .eclipse.templates/README.txt CHANGES.txt build.xml src/test/bin/test-patch.sh
Date Wed, 25 Jun 2008 14:31:03 GMT
Author: tomwhite
Date: Wed Jun 25 07:31:03 2008
New Revision: 671563

URL: http://svn.apache.org/viewvc?rev=671563&view=rev
Log:
HADOOP-3480.  Need to update Eclipse template to reflect current trunk.  Contributed by Brice
Arnould.

Added:
    hadoop/core/trunk/.eclipse.templates/README.txt
Modified:
    hadoop/core/trunk/.eclipse.templates/.classpath
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/build.xml
    hadoop/core/trunk/src/test/bin/test-patch.sh

Modified: hadoop/core/trunk/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/.eclipse.templates/.classpath?rev=671563&r1=671562&r2=671563&view=diff
==============================================================================
--- hadoop/core/trunk/.eclipse.templates/.classpath (original)
+++ hadoop/core/trunk/.eclipse.templates/.classpath Wed Jun 25 07:31:03 2008
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="src/test"/>
+	<classpathentry kind="src" path="src/benchmarks"/>
+	<classpathentry kind="src" path="src/core"/>
 	<classpathentry kind="src" path="src/examples"/>
+	<classpathentry kind="src" path="src/hdfs"/>
+	<classpathentry kind="src" path="src/mapred"/>
+	<classpathentry kind="src" path="src/test"/>
+	<classpathentry kind="src" path="src/tools"/>
 	<classpathentry kind="src" path="src/contrib/data_join/src/java"/>
 	<classpathentry kind="src" path="src/contrib/data_join/src/examples"/>
 	<classpathentry kind="src" path="src/contrib/streaming/src/java"/>
@@ -14,6 +18,7 @@
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/commons-net-1.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/jets3t-0.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-5.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-ext/commons-el.jar"/>
@@ -21,10 +26,17 @@
 	<classpathentry kind="lib" path="lib/jetty-ext/jasper-runtime.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-ext/jsp-api.jar"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/kfs-0.1.jar"/>
+	<classpathentry kind="lib" path="lib/kfs-0.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
+	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-1.4.3.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.4.3.jar"/>
 	<classpathentry kind="lib" path="lib/xmlenc-0.52.jar"/>
+	<classpathentry kind="lib" path="src/test/lib/ftplet-api-1.0.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="src/test/lib/ftpserver-core-1.0.0-SNAPSHOT.jar"/>
+	<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="output" path="build/eclipse-classes"/>
 </classpath>

Added: hadoop/core/trunk/.eclipse.templates/README.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/.eclipse.templates/README.txt?rev=671563&view=auto
==============================================================================
--- hadoop/core/trunk/.eclipse.templates/README.txt (added)
+++ hadoop/core/trunk/.eclipse.templates/README.txt Wed Jun 25 07:31:03 2008
@@ -0,0 +1,6 @@
+This directory contains templates for generating Eclipse files to configure
+Eclipse for Hadoop development.
+
+For further information please consult
+
+http://wiki.apache.org/hadoop/EclipseEnvironment 

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=671563&r1=671562&r2=671563&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Jun 25 07:31:03 2008
@@ -667,6 +667,9 @@
     HADOOP-3559. Fix the libhdfs test script and config to work with the
     current semantics. (lohit vijayarenu via cdouglas)
 
+    HADOOP-3480.  Need to update Eclipse template to reflect current trunk.
+    (Brice Arnould via tomwhite)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=671563&r1=671562&r2=671563&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Wed Jun 25 07:31:03 2008
@@ -1220,10 +1220,12 @@
           description="Generate files for Eclipse">
     <pathconvert property="eclipse.project">
       <path path="${basedir}"/>
-      <regexpmapper from="^.*/([^/]+)$$" to="\1"/>
+      <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
     </pathconvert>
-    <copy todir=".">
-      <fileset dir=".eclipse.templates"/>
+    <copy todir="." overwrite="true">
+      <fileset dir=".eclipse.templates">
+      	<exclude name="**/README.txt"/>
+      </fileset>
       <filterset>
         <filter token="PROJECT" value="${eclipse.project}"/>
       </filterset>

Modified: hadoop/core/trunk/src/test/bin/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/bin/test-patch.sh?rev=671563&r1=671562&r2=671563&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/core/trunk/src/test/bin/test-patch.sh Wed Jun 25 07:31:03 2008
@@ -464,6 +464,22 @@
 }
 
 ###############################################################################
+### Tests parts of contrib specific to the eclipse files
+runContribTestOnEclipseFiles () {
+  export ECLIPSE_DECLARED_JARS=$(sed -n 's@.*kind="lib".*path="\(.*jar\)".*@\1@p' < .eclipse.templates/.classpath
|sort)
+  export PRESENT_JARS=$(find lib/ -name '*.jar' |sort)
+  export ECLIPSE_DECLARED_SRC=$(sed -n 's@.*kind="src".*path="\(.*\)".*@\1@p' < .eclipse.templates/.classpath
|sort)
+  if [ "${ECLIPSE_DECLARED_JARS}" != "${PRESENT_JARS}" ]; then
+    echo "Some jars are not declared in the Eclipse project."
+    return 1
+  fi
+  for dir in $ECLIPSE_DECLARED_SRC; do
+    [ '!' -d $dir ] && echo "$dir is referenced in the Eclipse project although it
doesn't exists anymore." && return 1
+  done
+  return 0
+}
+
+###############################################################################
 ### Run the test-contrib target
 runContribTests () {
   echo ""
@@ -479,7 +495,7 @@
   ### Kill any rogue build processes from the last attempt
   $PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t
-I {} /usr/bin/kill -9 {} > /dev/null
 
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib && runContribTestOnEclipseFiles
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT
 



Mime
View raw message