commit fd62e4acf556e5b5938ccadb2df41f29749e3262

Author: Jakob Homan <jhoman@yahoo-inc.com>
Date:   Wed Jun 2 18:14:18 2010 -0700

    HDFS:1150 from https://issues.apache.org/jira/secure/attachment/12446210/HDFS-1150-Y20-BetterJsvcHandling.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HDFS-1150.FIX.  Verify datanodes' identities to clients in secure clusters.
    +    Update to patch to improve handling of jsvc source in build.xml (jghoman)
    +


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077484 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -161,6 +161,11 @@
   <property name="patch.cmd" value="patch"/>
   <property name="make.cmd" value="make"/>
 
+  <property name="jsvc.build.dir" value="${build.dir}/jsvc" />
+  <property name="jsvc.install.dir" value="${dist.dir}/bin" /> 
+  <property name="jsvc.location" value="http://apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-i386.tar.gz" />
+  <property name="jsvc.dest.name" value="jsvc.tar.gz" />
+
   <!-- task-controller properties set here -->
   <!-- Source directory from where configure is run and files are copied
   -->
@@ -176,10 +181,6 @@
   <property name="task-controller.install.dir" value="${dist.dir}/bin" />
   <!-- end of task-controller properties -->
 
-  <!-- jsvc properties set here -->
-  <property name="c++.jsvc.src" 
-    value="${basedir}/src/c++/jsvc" />
-	
   <!-- IVY properteis set here -->
   <property name="ivy.dir" location="ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
@@ -1288,7 +1289,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
+  <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio, jsvc"
 	  description="Build distribution">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
@@ -1401,7 +1402,7 @@
     </macro_tar>
   </target>
 
-  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio" 
+  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, ant-tasks, package-librecordio, jsvc" 
 		description="assembles artifacts for binary target">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
@@ -1718,7 +1719,7 @@
   </target>
 
   <target name="compile-c++" 
-          depends="compile-c++-pipes, jsvc"/>
+          depends="compile-c++-pipes"/>
 
   <target name="create-c++-examples-pipes-makefile" 
           depends="check-c++-makefiles" 
@@ -2256,14 +2257,16 @@
 
   <!-- end of task-controller targets -->
 
-  <!-- jsvc targets -->
-  <target name="jsvc" if="compile.c++">
-    <subant target="jsvc">
-      <property name="c++.jsvc.src" value="${c++.jsvc.src}" />
-      <property name="build.c++.jsvc" value="${build.c++}/jsvc" />
-      <property name="jsvc.install.dir" value="${dist.dir}/bin" /> 
-      <fileset file="${c++.jsvc.src}/build.xml"/>
-    </subant>
-  </target>
+  <target name="jsvc" >
+    <mkdir dir="${jsvc.build.dir}" />
+    <get src="${jsvc.location}" dest="${jsvc.build.dir}/${jsvc.dest.name}" />
+
+    <untar compression="gzip" src="${jsvc.build.dir}/${jsvc.dest.name}" dest="${jsvc.build.dir}" />
+
+    <copy file="${jsvc.build.dir}/jsvc" todir="${jsvc.install.dir}" verbose="true" />
+    <chmod perm="ugo+x" type="file">
+      <fileset file="${jsvc.install.dir}/jsvc"/>
+    </chmod>
+ </target>
 
 </project>

src/c++/jsvc/build.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project name="hadoopjsvc" default="compile">
-
-  <property name="jsvc.version" value="1.0.2" />
-  <property name="jsvc.tar.ball" value="commons-daemon-${jsvc.version}-src.tar.gz" />
-  <property name="jsvc.src.code.dir" value="commons-daemon-${jsvc.version}-src/src/native/unix" />
-
-  <target name="jsvc">
-    <mkdir dir="${build.c++.jsvc}" />
-
-    <untar src="${c++.jsvc.src}/${jsvc.tar.ball}" compression="gzip" dest="${build.c++.jsvc}" />
-
-    <exec executable="sh" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
-        failonerror="yes">
-        <arg value="support/buildconf.sh" />
-    </exec>
-
-    <exec executable="sh" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
-        failonerror="yes">
-        <arg value="configure" />
-    </exec>
-
-    <exec executable="make" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
-        failonerror="yes">
-        <arg value="clean" />
-    </exec>
-
-    <exec executable="make" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
-        failonerror="yes">
-    </exec>
-
-    <copy file="${build.c++.jsvc}/${jsvc.src.code.dir}/jsvc" todir="${jsvc.install.dir}"
-        verbose="true" />
-    <chmod perm="ugo+x" type="file">
-      <fileset file="${jsvc.install.dir}/jsvc"/>
-    </chmod>
-  </target>
-
-</project>