Return-Path: 
 <core-commits-return-9029-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 23220 invoked from network); 12 Jun 2009 19:29:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 12 Jun 2009 19:29:38 -0000
Received: (qmail 40491 invoked by uid 500); 12 Jun 2009 19:29:49 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 40413 invoked by uid 500); 12 Jun 2009 19:29:49 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 40404 invoked by uid 99); 12 Jun 2009 19:29:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 19:29:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 12 Jun 2009 19:29:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 225E423888D0; Fri, 12 Jun 2009 19:29:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r784246 -
 /hadoop/core/branches/HADOOP-3628-2/ivybuild.xml
Date: Fri, 12 Jun 2009 19:29:24 -0000
To: core-commits@hadoop.apache.org
From: stevel@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090612192924.225E423888D0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: stevel
Date: Fri Jun 12 19:29:23 2009
New Revision: 784246

URL: http://svn.apache.org/viewvc?rev=784246&view=rev
Log:
HADOOP-3628 the targets to do the merge back

Modified:
    hadoop/core/branches/HADOOP-3628-2/ivybuild.xml

Modified: hadoop/core/branches/HADOOP-3628-2/ivybuild.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-3628-2/ivybuild.xml?rev=784246&r1=784245&r2=784246&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-3628-2/ivybuild.xml (original)
+++ hadoop/core/branches/HADOOP-3628-2/ivybuild.xml Fri Jun 12 19:29:23 2009
@@ -281,5 +281,81 @@
       <arg line="resolve"/>
     </svn>
   </target>
+
+  <!--
+  svn diff \
+  https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2\
+  https://svn.apache.org/repos/asf/hadoop/core/trunk
+  -->
+  <target name="svn-diff-trunk" depends="svn-init"
+    description="diff against trunk"  >
+    <svn>
+      <arg value="diff" />
+      <arg value="https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2"/>
+      <arg value="https://svn.apache.org/repos/asf/hadoop/core/trunk"/>
+    </svn>
+  </target>
+    
+  
+  <target name="svn-create-changelist" depends="svn-init"
+    description="Create a changelist of everything we want in the big patch"  >
+    <property name="core/hadoop" value="src/core/org/apache/hadoop" />
+    <property name="hdfs/server" 
+        value="src/hdfs/org/apache/hadoop/hdfs/server" />
+    <property name="hadoop/mapred"
+        value="src/mapred/org/apache/hadoop/mapred/" />
+    <property name="test/core" 
+        value="src/test/org/apache/hadoop" />
+    <property name="test/hdfs/" 
+        value="src/test/hdfs/org/apache/hadoop/hdfs" />
+    <property name="test/mapred" 
+        value="src/test/mapred/org/apache/hadoop/mapred/" />
+
+    <svn>
+      <arg value="changelist"/>
+      <arg value="HADOOP-3628"/>
+      <!-- core -->
+      <arg value="${core/hadoop}/http/HttpServer.java" />
+      <!-- question this one -->
+      <!--
+      <arg value="${core/hadoop}/security/authorize/ConfiguredPolicy.java" />
+      -->
+      <arg value="${core/hadoop}/http/HttpServer.java" />
+      <arg value="${core/hadoop}/http/io/ThrowableWritable.java" />
+      <arg value="${core/hadoop}/util/Service.java" />
+      <arg value="${core/hadoop}/util/MockService.java" />
+      
+      <arg value="${hdfs/server}/datanode/DataNode.java" />
+      <arg value="${hdfs/server}/datanode/FSDataset.java" />
+      <arg value="${hdfs/server}/namenode/BackupNode" />
+      <arg value="${hdfs/server}/namenode/FSNamesystem.java" />
+      <arg value="${hdfs/server}/namenode/NameNode.java" />
+      <arg value="${hdfs/server}/namenode/PendingReplicationBlocks.java" />
+      <arg value="${hadoop/mapred}/JobEndNotifier.java" />
+      <arg value="${hadoop/mapred}/JobTracker.java" />
+      <arg value="${hadoop/mapred}/TaskTracker.java" />
+      <arg value="${hadoop/mapred}/TaskTrackerAction.java" />
+      <arg value="${hadoop/mapred}/TaskTrackerStatus.java" />
+      <arg value="${test/core}/io/TestThrowableWritable.java" />
+      <arg value="${test/core}/util/TestServiceLifecycle.java" />
+      <arg value="${test/hdfs}/server/namenode/TestReplicationPolicy.java" />
+      <arg value="${test/mapred}/TestTaskTrackerLifecycle.java" />
+    </svn>
+  </target>
+  
+  
+  <!--
+  svn diff \
+  https://svn.apache.org/repos/asf/hadoop/core/trunk \
+  https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2
+  -->
+  <target name="svn-diff-trunk" depends="svn-init"
+    description="diff against trunk"  >
+    <svn>
+      <arg value="diff" />
+      <arg value="https://svn.apache.org/repos/asf/hadoop/core/trunk"/>
+      <arg value="https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2"/>
+    </svn>
+  </target>                                                            
   
 </project>
\ No newline at end of file