Author: rvs
Date: Sat Mar 31 00:29:45 2012
New Revision: 1307664
URL: http://svn.apache.org/viewvc?rev=1307664&view=rev
Log:
BIGTOP-500. Oozie hive workflows are broken because of the HADOOP_HOME being
deprecated
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/hive.xml
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/hive.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/hive.xml?rev=1307664&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/hive.xml
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/hive.xml
Sat Mar 31 00:29:45 2012
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ 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.
+-->
+<configuration>
+ <property>
+ <name>hadoop.bin.path</name>
+ <value>/usr/bin/hadoop</value>
+ </property>
+
+ <property>
+ <name>hadoop.config.dir</name>
+ <value>/etc/hadoop/conf</value>
+ </property>
+</configuration>
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh?rev=1307664&r1=1307663&r2=1307664&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
Sat Mar 31 00:29:45 2012
@@ -212,6 +212,10 @@ sed -i -e '/oozie.service.HadoopAccessor
failIfNotOK
cp ${EXTRADIR}/oozie-env.sh ${OOZIE_CONF}
failIfNotOK
+install -d -m 0755 ${OOZIE_CONF}/action-conf
+failIfNotOK
+cp ${EXTRADIR}/hive.xml ${OOZIE_CONF}/action-conf
+failIfNotOK
if [ "${OOZIE_INITD}" != "" ]; then
install -d -m 0755 ${OOZIE_INITD}
failIfNotOK
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1307664&r1=1307663&r2=1307664&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
Sat Mar 31 00:29:45 2012
@@ -61,6 +61,7 @@ Source4: oozie-env.sh
Source5: oozie.init
Source6: catalina.properties
Source7: context.xml
+Source8: hive.xml
Patch0: patch
Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
Requires(post): /sbin/chkconfig
