Return-Path: 
 <common-commits-return-15898-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D6E979C1B
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Wed,  2 Nov 2011 22:11:01 +0000 (UTC)
Received: (qmail 77319 invoked by uid 500); 2 Nov 2011 22:11:01 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 77284 invoked by uid 500); 2 Nov 2011 22:11:01 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 77277 invoked by uid 99); 2 Nov 2011 22:11:01 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 22:11:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 02 Nov 2011 22:10:58 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 951EF2388C72
	for <common-commits@hadoop.apache.org>; Wed,  2 Nov 2011 22:10:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1196828 - in
 /hadoop/common/branches/branch-0.20-security:
 CHANGES.txt build.xml
Date: Wed, 02 Nov 2011 22:10:37 -0000
To: common-commits@hadoop.apache.org
From: eyang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111102221037.951EF2388C72@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: eyang
Date: Wed Nov  2 22:10:37 2011
New Revision: 1196828

URL: http://svn.apache.org/viewvc?rev=1196828&view=rev
Log:
HADOOP-7784. Fixed jsvc packaging. (Eric Yang)

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/build.xml

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1196828&r1=1196827&r2=1196828&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Nov  2 22:10:37 2011
@@ -8,6 +8,8 @@ Release 0.20.206.0 - unreleased
                     branch-0.20-security (Ravi Gummadi via amarrk)
   BUG FIXES
 
+    HADOOP-7784. Fixed jsvc packaging. (Eric Yang)
+
     HDFS-2305. Running multiple 2NNs can result in corrupt file system. (atm)
 
     HADOOP-7634. Docs specify wrong owner for task-controller.cfg (eli)

Modified: hadoop/common/branches/branch-0.20-security/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/build.xml?rev=1196828&r1=1196827&r2=1196828&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security/build.xml Wed Nov  2 22:10:37 2011
@@ -1427,7 +1427,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio, jsvc"
+  <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
 	  description="Build distribution">
     <delete dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}"/>
@@ -1530,6 +1530,14 @@
       <fileset dir="${basedir}/.eclipse.templates"/>
     </copy>
 
+    <subant target="task-controller">
+      <fileset dir="." includes="build.xml"/>
+    </subant>
+
+    <subant target="jsvc">
+      <fileset dir="." includes="build.xml"/>
+    </subant>
+
     <chmod perm="ugo+x" type="file" parallel="false">
         <fileset dir="${dist.dir}/bin"/>
         <fileset dir="${dist.dir}/sbin"/>
@@ -1572,7 +1580,7 @@
     </macro_tar>
   </target>
 
-  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio, jsvc" 
+  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio" 
 		description="assembles artifacts for binary target">
     <delete dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}"/>
@@ -1647,10 +1655,6 @@
       </fileset>
     </copy>
 
-    <copy todir="${dist.dir}/.eclipse.templates">
-      <fileset dir="${basedir}/.eclipse.templates"/>
-    </copy>
-
     <copy todir="${dist.dir}/etc/hadoop">
       <fileset dir="${conf.dir}" excludes="**/*.template"/>
     </copy>
@@ -1679,6 +1683,14 @@
       </fileset>
     </copy>
 
+    <subant target="task-controller">
+      <fileset dir="." includes="build.xml"/>
+    </subant>
+
+    <subant target="jsvc">
+      <fileset dir="." includes="build.xml"/>
+    </subant>
+
     <chmod perm="ugo+x" type="file" parallel="false">
         <fileset dir="${dist.dir}/bin"/>
         <fileset dir="${dist.dir}/libexec"/>