HADOOP-4791. Fix rpm build process for Chukwa. Contributed by Eric Yang

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@727224 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -457,6 +457,8 @@ Release 0.20.0 - Unreleased
     Object.equals rather than depend on contentEquals api. (omalley via 
     acmurthy)
 
+    HADOOP-4791. Fix rpm build process for Chukwa. (Eric Yang via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/contrib/chukwa/build.xml

@@ -22,13 +22,14 @@
 
 	<property name="name" value="chukwa"/>
         <property name="chukwaVersion" value="0.1.1"/>
-	<property name="rpm.prefix" value="/usr/local"/>
-	<property name="hadoop.conf" value="/usr/local/hadoop/conf"/>
 	<property name="final.name" value="${name}-${chukwaVersion}"/>
 
         <import file="../build-contrib.xml" optional="true"/>
         <available file="../build-contrib.xml" property="present"/>
 
+        <property file="build.properties"/>
+        <property file="default.properties"/>
+
         <condition property="standaloneMode">
                 <and><not><available file="../build-contrib.xml" property="present"/></not></and>
         </condition>
@@ -749,7 +750,6 @@
 
 %define _topdir         ${build.dir}
 %define _prefix         ${rpm.prefix}
-%define _conf           ${hadoop.conf}
 %define name            chukwa
 %define summary         Distributed Computing Monitoring Framework.
 %define version         ${chukwaVersion}
@@ -787,10 +787,10 @@ fi
 mv %{buildroot}/%{name}-%{version} %{buildroot}%{_prefix}/%{name}
 cd %{buildroot}%{_prefix}
 mkdir -p %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-data-processors %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-collector %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-agent %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-system-metrics %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-data-processors | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' > %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-collector | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' > %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-agent | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' > %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-system-metrics | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' > %{buildroot}/etc/init.d
 chmod a+x %{buildroot}/etc/init.d/chukwa-*
 rm -rf %{buildroot}%{_prefix}/%{name}/src
 rm -rf %{buildroot}%{_prefix}/%{name}/build.xml

src/contrib/chukwa/default.properties

@@ -0,0 +1,15 @@
+#   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.
+rpm.prefix=/usr/local

src/contrib/chukwa/tools/init.d/chukwa-agent

@@ -30,11 +30,7 @@ DAEMON=agent.sh
 prog=chukwa-agent
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

src/contrib/chukwa/tools/init.d/chukwa-collector

@@ -30,11 +30,7 @@ DAEMON=jettyCollector.sh
 prog=chukwa-collector
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

src/contrib/chukwa/tools/init.d/chukwa-data-processors

@@ -28,11 +28,7 @@ fi
 prog=chukwa-data-processors
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

src/contrib/chukwa/tools/init.d/chukwa-system-metrics

@@ -30,11 +30,7 @@ DAEMON=systemDataLoader.sh
 prog=chukwa-system-metrics
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {