Author: rvs
Date: Wed Feb 8 02:30:04 2012
New Revision: 1241745
URL: http://svn.apache.org/viewvc?rev=1241745&view=rev
Log:
BIGTOP-333. heed to start properly packaging httpfs
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1241745&r1=1241744&r2=1241745&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Wed Feb 8 02:30:04 2012
@@ -185,16 +185,6 @@ cp -a ${BUILD_DIR}/bin/* ${HADOOP_BIN_DI
install -d -m 0755 ${HADOOP_SBIN_DIR}
cp ${BUILD_DIR}/sbin/* ${HADOOP_SBIN_DIR}/
-# HTTPFS
-install -d -m 0755 ${HTTPFS_DIR}/sbin
-cp ${HADOOP_SBIN_DIR}/httpfs.sh ${HTTPFS_DIR}/sbin/
-install -d -m 0755 ${HTTPFS_DIR}/libexec
-cp ${SYSTEM_LIBEXEC_DIR}/httpfs-config.sh ${HTTPFS_DIR}/libexec/
-cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/* ${HTTPFS_DIR}/
-chmod 644 ${HTTPFS_DIR}/conf/*
-install -d -m 0755 $HTTPFS_ETC_DIR/conf.empty
-cp ${BUILD_DIR}/etc/hadoop/httpfs* $HTTPFS_ETC_DIR/conf.empty
-
# jars
install -d -m 0755 ${HADOOP_LIB_DIR}
cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${HADOOP_LIB_DIR}/
@@ -245,6 +235,16 @@ mkdir -p $MAN_DIR/man1
gzip -c < $DISTRO_DIR/hadoop.1 > $MAN_DIR/man1/hadoop.1.gz
chmod 644 $MAN_DIR/man1/hadoop.1.gz
+# HTTPFS
+install -d -m 0755 ${HTTPFS_DIR}/sbin
+mv ${HADOOP_SBIN_DIR}/httpfs.sh ${HTTPFS_DIR}/sbin/
+install -d -m 0755 ${HTTPFS_DIR}/libexec
+mv ${SYSTEM_LIBEXEC_DIR}/httpfs-config.sh ${HTTPFS_DIR}/libexec/
+cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/* ${HTTPFS_DIR}/
+chmod 644 ${HTTPFS_DIR}/conf/*
+install -d -m 0755 $HTTPFS_ETC_DIR/conf.empty
+mv $HADOOP_ETC_DIR/conf.empty/httpfs* $HTTPFS_ETC_DIR/conf.empty
+
# Make the pseudo-distributed config
for conf in conf.pseudo ; do
install -d -m 0755 $HADOOP_ETC_DIR/$conf
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install?rev=1241745&r1=1241744&r2=1241745&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
Wed Feb 8 02:30:04 2012
@@ -1,10 +1,8 @@
/etc/hadoop/conf.empty/hdfs-site.xml
-/etc/hadoop/conf.empty/httpfs-*
/usr/lib/hadoop/hadoop-hdfs*.jar
/usr/lib/hadoop/hadoop-archives*.jar
/usr/lib/hadoop/libexec/jsvc
/usr/lib/hadoop/libexec/hdfs-config.sh
-/usr/lib/hadoop/libexec/httpfs-config.sh
/usr/lib/hadoop/webapps
/usr/lib/hadoop/sbin/update-hdfs-env.sh
/usr/lib/hadoop/sbin/start-secure-dns.sh
@@ -15,7 +13,6 @@
/usr/lib/hadoop/sbin/stop-dfs.sh
/usr/lib/hadoop/sbin/refresh-namenodes.sh
/usr/lib/hadoop/sbin/distribute-exclude.sh
-/usr/lib/hadoop/sbin/httpfs.sh
/usr/lib/hadoop/bin/hdfs
/usr/bin/hdfs
# FIXME: HADOOP-7939
