hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1196828 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt build.xml
Date Wed, 02 Nov 2011 22:10:37 GMT
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"/>



Mime
View raw message