incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1299107 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/hadoop/ common/hadoop/conf.empty/ common/hadoop/conf.pseudo/ deb/hadoop/ rpm/hadoop/SPECS/
Date Fri, 09 Mar 2012 23:48:26 GMT
Author: rvs
Date: Fri Mar  9 23:48:24 2012
New Revision: 1299107

URL: http://svn.apache.org/viewvc?rev=1299107&view=rev
Log:
BIGTOP-435. need to split hadoop subpackages even further for hadoop-0.23

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml   (contents, props changed)
      - copied, changed from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-layout.sh
      - copied, changed from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.default
      - copied, changed from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/httpfs.default
      - copied, changed from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default
      - copied, changed from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-namenode.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-native.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-native.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-source.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.dirs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml Fri Mar  9 23:48:24 2012
@@ -18,13 +18,4 @@
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <configuration>
-  <property>
-    <name>fs.default.name</name>
-    <value>hdfs://localhost:8020</value>
-  </property>
-
-  <property>
-     <name>hadoop.tmp.dir</name>
-     <value>/var/lib/hadoop/cache/${user.name}</value>
-  </property>
 </configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml Fri Mar  9 23:48:24 2012
@@ -20,6 +20,6 @@
 <configuration>
   <property>
      <name>dfs.name.dir</name>
-     <value>/var/lib/hadoop/cache/hadoop/dfs/name</value>
+     <value>/var/lib/hadoop-hdfs/cache/hdfs/dfs/name</value>
   </property>
 </configuration>

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml (from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml&r1=1298204&r2=1299107&rev=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml Fri Mar  9 23:48:24 2012
@@ -31,18 +31,30 @@
   <property>
     <description>List of directories to store localized files in.</description>
     <name>yarn.nodemanager.local-dirs</name>
-    <value>/var/lib/yarn/cache/${user.name}/nm-local-dir</value>
+    <value>/var/lib/hadoop-yarn/cache/${user.name}/nm-local-dir</value>
   </property>
 
   <property>
     <description>Where to store container logs.</description>
     <name>yarn.nodemanager.log-dirs</name>
-    <value>/var/log/yarn</value>
+    <value>/var/log/hadoop-yarn/containers</value>
   </property>
 
   <property>
     <description>Where to aggregate logs to.</description>
     <name>yarn.nodemanager.remote-app-log-dir</name>
-    <value>/var/log/yarn</value>
+    <value>/var/log/hadoop-yarn/apps</value>
+  </property>
+
+  <property>
+    <description>Classpath for typical applications.</description>
+     <name>yarn.application.classpath</name>
+     <value>
+        $HADOOP_CONF_DIR,
+        $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*,
+        $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*,
+        $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*,
+        $YARN_HOME/*,$YARN_HOME/lib/*
+     </value>
   </property>
 </configuration>

Propchange: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml Fri Mar  9 23:48:24 2012
@@ -23,11 +23,6 @@
     <value>hdfs://localhost:8020</value>
   </property>
 
-  <property>
-     <name>hadoop.tmp.dir</name>
-     <value>/var/lib/hadoop/cache/${user.name}</value>
-  </property>
-
   <!-- OOZIE proxy user setting -->
   <property>
     <name>hadoop.proxyuser.oozie.hosts</name>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml Fri Mar  9 23:48:24 2012
@@ -38,18 +38,18 @@
   </property>
   <property>
      <name>hadoop.tmp.dir</name>
-     <value>/var/lib/hdfs/cache/${user.name}</value>
+     <value>/var/lib/hadoop-hdfs/cache/${user.name}</value>
   </property>
   <property>
      <name>dfs.namenode.name.dir</name>
-     <value>/var/lib/hdfs/cache/${user.name}/dfs/name</value>
+     <value>/var/lib/hadoop-hdfs/cache/${user.name}/dfs/name</value>
   </property>
   <property>
      <name>dfs.namenode.checkpoint.dir</name>
-     <value>/var/lib/hdfs/cache/${user.name}/dfs/namesecondary</value>
+     <value>/var/lib/hadoop-hdfs/cache/${user.name}/dfs/namesecondary</value>
   </property>
   <property>
      <name>dfs.datanode.data.dir</name>
-     <value>/var/lib/hdfs/cache/${user.name}/dfs/data</value>
+     <value>/var/lib/hadoop-hdfs/cache/${user.name}/dfs/data</value>
   </property>
 </configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml Fri Mar  9 23:48:24 2012
@@ -36,7 +36,7 @@
   <property>
     <description>To set the value of tmp directory for map and reduce tasks.</description>
     <name>mapreduce.task.tmp.dir</name>
-    <value>/var/lib/mapreduce/cache/${user.name}/tasks</value>
+    <value>/var/lib/hadoop-mapreduce/cache/${user.name}/tasks</value>
   </property>
 
 </configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml Fri Mar  9 23:48:24 2012
@@ -31,18 +31,30 @@
   <property>
     <description>List of directories to store localized files in.</description>
     <name>yarn.nodemanager.local-dirs</name>
-    <value>/var/lib/yarn/cache/${user.name}/nm-local-dir</value>
+    <value>/var/lib/hadoop-yarn/cache/${user.name}/nm-local-dir</value>
   </property>
 
   <property>
     <description>Where to store container logs.</description>
     <name>yarn.nodemanager.log-dirs</name>
-    <value>/var/log/yarn</value>
+    <value>/var/log/hadoop-yarn/containers</value>
   </property>
 
   <property>
     <description>Where to aggregate logs to.</description>
     <name>yarn.nodemanager.remote-app-log-dir</name>
-    <value>/var/log/yarn</value>
+    <value>/var/log/hadoop-yarn/apps</value>
+  </property>
+
+  <property>
+    <description>Classpath for typical applications.</description>
+     <name>yarn.application.classpath</name>
+     <value>
+        $HADOOP_CONF_DIR,
+        $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*,
+        $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*,
+        $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*,
+        $YARN_HOME/*,$YARN_HOME/lib/*
+     </value>
   </property>
 </configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc Fri Mar  9 23:48:24 2012
@@ -19,7 +19,7 @@ EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-d
 SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/hadoop/hadoop-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="2345 85 15"
@@ -46,7 +46,7 @@ start() {
   #    1. HADOOP_DATANODE_USER being set to root
   #    2. jsvc is installed but Hadoop is configures to run in an unsecure mode
   # Both will currently fail
-  if [ -f $HADOOP_PREFIX/libexec/jsvc ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
+  if [ -n "$HADOOP_SECURE_DN_USER" ]; then
     TARGET_USER=root
   fi
 

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc Fri Mar  9 23:48:24 2012
@@ -19,7 +19,7 @@ EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-d
 SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/hadoop/hadoop-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="2345 85 15"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc Fri Mar  9 23:48:24 2012
@@ -19,7 +19,7 @@ EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-d
 SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/hadoop/hadoop-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="2345 85 15"

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-layout.sh (from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-layout.sh?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-layout.sh&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default&r1=1298204&r2=1299107&rev=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-layout.sh Fri Mar  9 23:48:24 2012
@@ -12,10 +12,12 @@
 # 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.
-
-# FIXME: MAPREDUCE-3900
-export YARN_HOME=/usr/lib/hadoop
-export YARN_IDENT_STRING=mapreduce
-export YARN_PID_DIR=/var/run/mapreduce
-export YARN_LOG_DIR=/var/log/mapreduce
-export YARN_CONF_DIR=/etc/hadoop/conf
+HADOOP_COMMON_DIR="./"
+HADOOP_COMMON_LIB_JARS_DIR="lib"
+HADOOP_COMMON_LIB_NATIVE_DIR="lib/native"
+HDFS_DIR="./"
+HDFS_LIB_JARS_DIR="lib"
+YARN_DIR="./"
+YARN_LIB_JARS_DIR="lib"
+MAPRED_DIR="./"
+MAPRED_LIB_JARS_DIR="lib"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc Fri Mar  9 23:48:24 2012
@@ -15,11 +15,11 @@
 HADOOP_NAME="historyserver"
 DAEMON="hadoop-mapreduce-$HADOOP_NAME"
 DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/mr-jobhistory-daemon.sh"
+EXEC_PATH="/usr/lib/hadoop-mapreduce/sbin/mr-jobhistory-daemon.sh"
 SVC_USER="mapreduce"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/mapreduce/yarn-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-mapreduce/yarn-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="345 85 15"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc Fri Mar  9 23:48:24 2012
@@ -15,11 +15,11 @@
 HADOOP_NAME="nodemanager"
 DAEMON="hadoop-yarn-$HADOOP_NAME"
 DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
 SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="345 85 15"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc Fri Mar  9 23:48:24 2012
@@ -15,11 +15,11 @@
 HADOOP_NAME="proxyserver"
 DAEMON="hadoop-yarn-$HADOOP_NAME"
 DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
 SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="345 85 15"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc Fri Mar  9 23:48:24 2012
@@ -15,11 +15,11 @@
 HADOOP_NAME="resourcemanager"
 DAEMON="hadoop-yarn-$HADOOP_NAME"
 DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
 SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
 LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
 
 CHKCONFIG="345 85 15"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default Fri Mar  9 23:48:24 2012
@@ -15,24 +15,11 @@
 export HADOOP_HOME_WARN_SUPPRESS=true
 export HADOOP_HOME=/usr/lib/hadoop
 export HADOOP_PREFIX=/usr/lib/hadoop
+
 export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec
-export HADOOP_NAMENODE_USER=hdfs
-export HADOOP_SECONDARYNAMENODE_USER=hdfs
-export HADOOP_DATANODE_USER=hdfs
-export HADOOP_JOBTRACKER_USER=mapred
-export HADOOP_TASKTRACKER_USER=mapred
-export HADOOP_IDENT_STRING=hdfs
-export HADOOP_PID_DIR=/var/run/hadoop
-export HADOOP_LOG_DIR=/var/log/hadoop
 export HADOOP_CONF_DIR=/etc/hadoop/conf
-export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HADOOP_PREFIX}/*:${HADOOP_PREFIX}/lib/*:${HADOOP_PREFIX}/"
 
-# Pointless definitions making yarn happy
-export HADOOP_COMMON_HOME=${HADOOP_PREFIX}
-export HADOOP_HDFS_HOME=${HADOOP_PREFIX}
-export YARN_HOME=/usr/lib/hadoop
-export YARN_IDENT_STRING=yarn
-export YARN_PID_DIR=/var/run/yarn
-export YARN_LOG_DIR=/var/log/yarn
-export YARN_CONF_DIR=/etc/hadoop/conf
-export YARN_CLASSPATH="${YARN_CLASSPATH}:${YARN_HOME}/*:${YARN_HOME}/lib/*"
+export HADOOP_COMMON_HOME=/usr/lib/hadoop
+export HADOOP_HDFS_HOME=/usr/lib/hadoop-hdfs
+export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce
+export YARN_HOME=/usr/lib/hadoop-yarn

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.default (from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.default?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.default&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default&r1=1298204&r2=1299107&rev=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hdfs.default Fri Mar  9 23:48:24 2012
@@ -12,10 +12,11 @@
 # 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.
+export HADOOP_PID_DIR=/var/run/hadoop-hdfs
+export HADOOP_LOG_DIR=/var/log/hadoop-hdfs
+export HADOOP_NAMENODE_USER=hdfs
+export HADOOP_SECONDARYNAMENODE_USER=hdfs
+export HADOOP_DATANODE_USER=hdfs
+export HADOOP_IDENT_STRING=hdfs
 
-# FIXME: MAPREDUCE-3900
-export YARN_HOME=/usr/lib/hadoop
-export YARN_IDENT_STRING=mapreduce
-export YARN_PID_DIR=/var/run/mapreduce
-export YARN_LOG_DIR=/var/log/mapreduce
-export YARN_CONF_DIR=/etc/hadoop/conf
+# export HADOOP_SECURE_DN_USER=hdfs

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/httpfs.default (from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/httpfs.default?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/httpfs.default&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default&r1=1298204&r2=1299107&rev=1299107&view=diff
==============================================================================
    (empty)

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=1299107&r1=1299106&r2=1299107&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 Fri Mar  9 23:48:24 2012
@@ -41,6 +41,9 @@ OPTS=$(getopt \
   -l 'installed-lib-dir:' \
   -l 'hadoop-dir:' \
   -l 'httpfs-dir:' \
+  -l 'hdfs-dir:' \
+  -l 'yarn-dir:' \
+  -l 'mapreduce-dir:' \
   -l 'system-include-dir:' \
   -l 'system-lib-dir:' \
   -l 'system-libexec-dir:' \
@@ -71,6 +74,15 @@ while true ; do
         --hadoop-dir)
         HADOOP_DIR=$2 ; shift 2
         ;;
+        --hdfs-dir)
+        HDFS_DIR=$2 ; shift 2
+        ;;
+        --yarn-dir)
+        YARN_DIR=$2 ; shift 2
+        ;;
+        --mapreduce-dir)
+        MAPREDUCE_DIR=$2 ; shift 2
+        ;;
         --system-include-dir)
         SYSTEM_INCLUDE_DIR=$2 ; shift 2
         ;;
@@ -123,6 +135,9 @@ for var in PREFIX BUILD_DIR; do
 done
 
 HADOOP_DIR=${HADOOP_DIR:-$PREFIX/usr/lib/hadoop}
+HDFS_DIR=${HDFS_DIR:-$PREFIX/usr/lib/hadoop-hdfs}
+YARN_DIR=${YARN_DIR:-$PREFIX/usr/lib/hadoop-yarn}
+MAPREDUCE_DIR=${MAPREDUCE_DIR:-$PREFIX/usr/lib/hadoop-mapreduce}
 HTTPFS_DIR=${HTTPFS_DIR:-$PREFIX/usr/lib/hadoop-httpfs}
 SYSTEM_LIB_DIR=${SYSTEM_LIB_DIR:-/usr/lib}
 BIN_DIR=${BIN_DIR:-$PREFIX/usr/bin}
@@ -135,11 +150,7 @@ HADOOP_ETC_DIR=${HADOOP_ETC_DIR:-$PREFIX
 HTTPFS_ETC_DIR=${HTTPFS_ETC_DIR:-$PREFIX/etc/hadoop-httpfs}
 
 INSTALLED_HADOOP_DIR=${INSTALLED_HADOOP_DIR:-/usr/lib/hadoop}
-
-HADOOP_BIN_DIR=${HADOOP_DIR}/bin
-HADOOP_SBIN_DIR=${HADOOP_DIR}/sbin
-HADOOP_LIB_DIR=${HADOOP_DIR}/lib
-HADOOP_NATIVE_LIB_DIR=${HADOOP_LIB_DIR}/native
+HADOOP_NATIVE_LIB_DIR=${HADOOP_DIR}/lib/native
 
 HADOOP_VERSION=0.23.1
 
@@ -149,12 +160,11 @@ export PATH="/sbin/:$PATH"
 # Make bin wrappers
 mkdir -p $BIN_DIR
 
-for bin_wrapper in hadoop yarn hdfs mapred; do
-  wrapper=$BIN_DIR/$bin_wrapper
+for component in $HADOOP_DIR/bin/hadoop $HDFS_DIR/bin/hdfs $YARN_DIR/bin/yarn $MAPREDUCE_DIR/bin/mapred ; do
+  wrapper=$BIN_DIR/${component#*/bin/}
   cat > $wrapper <<EOF
 #!/bin/sh
 
-
 # Autodetect JAVA_HOME if not defined
 if [ -e /usr/libexec/bigtop-detect-javahome ]; then
 . /usr/libexec/bigtop-detect-javahome
@@ -163,12 +173,8 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
 fi
 
 . /etc/default/hadoop
-[ -f /etc/default/${bin_wrapper/hadoop/yarn} ] && . /etc/default/${bin_wrapper/hadoop/yarn}
-
-# FIXME: this might need to be fixed upstream
-HADOOP_CLASSPATH="\${HADOOP_CLASSPATH}:\${YARN_CONF_DIR}"
 
-exec $INSTALLED_HADOOP_DIR/bin/$bin_wrapper "\$@"
+exec ${component#${PREFIX}} "\$@"
 EOF
   chmod 755 $wrapper
 done
@@ -176,30 +182,57 @@ done
 #libexec
 install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
 cp ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
-
-# bin
-install -d -m 0755 ${HADOOP_BIN_DIR}
-cp -a ${BUILD_DIR}/bin/* ${HADOOP_BIN_DIR}/
-
-# sbin
-install -d -m 0755 ${HADOOP_SBIN_DIR}
-cp ${BUILD_DIR}/sbin/* ${HADOOP_SBIN_DIR}/
-
-# jars
-install -d -m 0755 ${HADOOP_LIB_DIR}
-cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${HADOOP_LIB_DIR}/
-cp ${BUILD_DIR}/share/hadoop/common/lib/*.jar ${HADOOP_LIB_DIR}/
-cp ${BUILD_DIR}/share/hadoop/hdfs/lib/*.jar ${HADOOP_LIB_DIR}/
-chmod 644 ${HADOOP_LIB_DIR}/*.jar
+cp ${DISTRO_DIR}/hadoop-layout.sh ${SYSTEM_LIBEXEC_DIR}/
 
 # hadoop jar
 install -d -m 0755 ${HADOOP_DIR}
-cp ${BUILD_DIR}/share/hadoop/mapreduce/*.jar ${HADOOP_DIR}/
 cp ${BUILD_DIR}/share/hadoop/common/*.jar ${HADOOP_DIR}/
-cp ${BUILD_DIR}/share/hadoop/hdfs/*.jar ${HADOOP_DIR}/
-cp ${BUILD_DIR}/share/hadoop/tools/lib/*.jar ${HADOOP_DIR}/
-mv ${HADOOP_LIB_DIR}/hadoop*.jar ${HADOOP_DIR}/
-chmod 644 ${HADOOP_DIR}/*.jar
+cp ${BUILD_DIR}/share/hadoop/common/lib/hadoop-auth*.jar ${HADOOP_DIR}/
+install -d -m 0755 ${MAPREDUCE_DIR}
+cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-mapreduce*.jar ${MAPREDUCE_DIR}
+cp ${BUILD_DIR}/share/hadoop/tools/lib/*.jar ${MAPREDUCE_DIR}
+install -d -m 0755 ${HDFS_DIR}
+cp ${BUILD_DIR}/share/hadoop/hdfs/*.jar ${HDFS_DIR}/
+install -d -m 0755 ${YARN_DIR}
+cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-yarn*.jar ${YARN_DIR}/
+chmod 644 ${HADOOP_DIR}/*.jar ${MAPREDUCE_DIR}/*.jar ${HDFS_DIR}/*.jar ${YARN_DIR}/*.jar
+
+# lib jars
+install -d -m 0755 ${HADOOP_DIR}/lib
+cp ${BUILD_DIR}/share/hadoop/common/lib/*.jar ${HADOOP_DIR}/lib
+rm -f ${HADOOP_DIR}/lib/hadoop*.jar
+install -d -m 0755 ${MAPREDUCE_DIR}/lib
+cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${MAPREDUCE_DIR}/lib
+install -d -m 0755 ${HDFS_DIR}/lib 
+cp ${BUILD_DIR}/share/hadoop/hdfs/lib/*.jar ${HDFS_DIR}/lib
+install -d -m 0755 ${YARN_DIR}/lib
+cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${YARN_DIR}/lib
+chmod 644 ${HADOOP_DIR}/lib/*.jar ${MAPREDUCE_DIR}/lib/*.jar ${HDFS_DIR}/lib/*.jar ${YARN_DIR}/lib/*.jar
+
+# Install webapps
+cp -ra ${BUILD_DIR}/share/hadoop/hdfs/webapps ${HDFS_DIR}/
+
+# bin
+install -d -m 0755 ${HADOOP_DIR}/bin
+cp -a ${BUILD_DIR}/bin/{hadoop,rcc} ${HADOOP_DIR}/bin
+install -d -m 0755 ${HDFS_DIR}/bin
+cp -a ${BUILD_DIR}/bin/hdfs ${HDFS_DIR}/bin
+install -d -m 0755 ${YARN_DIR}/bin
+cp -a ${BUILD_DIR}/bin/{yarn,container-executor} ${YARN_DIR}/bin
+install -d -m 0755 ${MAPREDUCE_DIR}/bin
+cp -a ${BUILD_DIR}/bin/mapred ${MAPREDUCE_DIR}/bin
+# FIXME: MAPREDUCE-3980
+cp -a ${BUILD_DIR}/bin/mapred ${YARN_DIR}/bin
+
+# sbin
+install -d -m 0755 ${HADOOP_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/{hadoop-daemon,hadoop-daemons,slaves,start-all,stop-all}.sh ${HADOOP_DIR}/sbin
+install -d -m 0755 ${HDFS_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/{distribute-exclude,refresh-namenodes,start-balancer,start-dfs,start-secure-dns,stop-balancer,stop-dfs,stop-secure-dns}.sh ${HDFS_DIR}/sbin
+install -d -m 0755 ${YARN_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/*yarn* ${BUILD_DIR}/sbin/slaves.sh  ${YARN_DIR}/sbin
+install -d -m 0755 ${MAPREDUCE_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/mr-jobhistory-daemon.sh ${MAPREDUCE_DIR}/sbin
 
 # native libs
 install -d -m 0755 ${SYSTEM_LIB_DIR}
@@ -224,7 +257,6 @@ done
 install -d -m 0755 $HADOOP_ETC_DIR/conf.empty
 
 cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
-cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/conf.empty
 
 # docs
 install -d -m 0755 ${DOC_DIR}
@@ -237,14 +269,12 @@ 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/
+cp ${BUILD_DIR}/sbin/httpfs.sh ${HTTPFS_DIR}/sbin/
 install -d -m 0755 ${HTTPFS_DIR}/libexec
-mv ${SYSTEM_LIBEXEC_DIR}/httpfs-config.sh ${HTTPFS_DIR}/libexec/
+cp ${BUILD_DIR}/libexec/httpfs-config.sh ${HTTPFS_DIR}/libexec/
 cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/webapps ${HTTPFS_DIR}/
 cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/conf ${HTTPFS_DIR}/
 chmod 644 ${HTTPFS_DIR}/conf/*
-# FIXME: bug in HADOOP
-ln -s /usr/lib/bigtop-tomcat/bin ${HTTPFS_DIR}/bin
 install -d -m 0755 $HTTPFS_ETC_DIR/conf.empty
 mv $HADOOP_ETC_DIR/conf.empty/httpfs* $HTTPFS_ETC_DIR/conf.empty
 
@@ -253,7 +283,6 @@ for conf in conf.pseudo ; do
   install -d -m 0755 $HADOOP_ETC_DIR/$conf
   # Overlay the -site files
   (cd $DISTRO_DIR/$conf && tar -cf - .) | (cd $HADOOP_ETC_DIR/$conf && tar -xf -)
-  cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/$conf
 done
 cp ${BUILD_DIR}/etc/hadoop/log4j.properties $HADOOP_ETC_DIR/conf.pseudo
 
@@ -262,29 +291,22 @@ install -d -m 0755 ${HADOOP_DIR}/etc
 ln -s ${HADOOP_ETC_DIR##${PREFIX}}/conf ${HADOOP_DIR}/etc/hadoop
 
 # FIXME: Provide convenience links for log/run in hdfs and mapreduce (HADOOP-7939)
-install -d -m 0755 $PREFIX/var/log/ $PREFIX/var/run/
-ln -s hadoop $PREFIX/var/log/hdfs
-ln -s hadoop $PREFIX/var/run/hdfs
-ln -s hadoop $PREFIX/var/log/mapreduce
-ln -s hadoop $PREFIX/var/run/mapreduce
+install -d -m 0755 $PREFIX/var/{log,run,lib}/hadoop-hdfs
+install -d -m 0755 $PREFIX/var/{log,run,lib}/hadoop-yarn
+install -d -m 0755 $PREFIX/var/{log,run,lib}/hadoop-mapreduce
 
 # FIXME: The following needs to be untangled upstream (HADOOP-7939)
 cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-mapreduce-client-shuffle*.jar ${HADOOP_DIR}/lib/
 cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-mapreduce-client-core*.jar ${HADOOP_DIR}/lib/
 
-# Remove all hadoop test jars
-rm -fv ${HADOOP_DIR}/*test*.jar
-
-# Install webapps
-cp -ra ${BUILD_DIR}/share/hadoop/hdfs/webapps ${HADOOP_DIR}/
-
-
-# Create version-less symlinks to offer integration point with other projects
-(cd $HADOOP_DIR &&
-for j in hadoop-*.jar; do
-  if [[ $j =~ hadoop-(.*)-${HADOOP_VERSION}.jar ]]; then
-    name=${BASH_REMATCH[1]}
-    ln -s $j hadoop-$name.jar
-  fi
-done)
-
+# Remove all source and test jars and create version-less symlinks to offer integration point with other projects
+for DIR in ${HADOOP_DIR} ${HDFS_DIR} ${YARN_DIR} ${MAPREDUCE_DIR} ${HTTPFS_DIR} ; do
+  (cd $DIR &&
+   rm -fv *-test.jar *-sources.jar
+   for j in hadoop-*.jar; do
+     if [[ $j =~ hadoop-(.*)-${HADOOP_VERSION}.jar ]]; then
+       name=${BASH_REMATCH[1]}
+       ln -s $j hadoop-$name.jar
+     fi
+   done)
+done

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default (from r1298204, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default&r1=1298204&r2=1299107&rev=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default Fri Mar  9 23:48:24 2012
@@ -14,8 +14,7 @@
 # limitations under the License.
 
 # FIXME: MAPREDUCE-3900
-export YARN_HOME=/usr/lib/hadoop
 export YARN_IDENT_STRING=mapreduce
-export YARN_PID_DIR=/var/run/mapreduce
-export YARN_LOG_DIR=/var/log/mapreduce
-export YARN_CONF_DIR=/etc/hadoop/conf
+export YARN_PID_DIR=/var/run/hadoop-mapreduce
+export YARN_LOG_DIR=/var/log/hadoop-mapreduce
+export HADOOP_LOG_DIR=/var/log/hadoop-mapreduce

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default Fri Mar  9 23:48:24 2012
@@ -12,9 +12,7 @@
 # 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.
-export YARN_HOME=/usr/lib/hadoop
 export YARN_IDENT_STRING=yarn
-export YARN_PID_DIR=/var/run/yarn
-export YARN_LOG_DIR=/var/log/yarn
+export YARN_PID_DIR=/var/run/hadoop-yarn
+export YARN_LOG_DIR=/var/log/hadoop-yarn
 export YARN_CONF_DIR=/etc/hadoop/conf
-export YARN_CLASSPATH="${YARN_CLASSPATH}:${YARN_HOME}/*:${YARN_HOME}/lib/*"

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control Fri Mar  9 23:48:24 2012
@@ -100,12 +100,6 @@ Description: Documentation for Hadoop
  This package contains the Java Documentation for Hadoop and its relevant
  APIs.
 
-Package: hadoop-source
-Provides: hadoop-source
-Architecture: all
-Description: Source code for Hadoop
- This package contains the source code for Hadoop and its contrib modules.
-
 Package: hadoop-conf-pseudo
 Provides: hadoop-conf-pseudo
 Architecture: all
@@ -172,14 +166,6 @@ Description: Data Node for Hadoop
  blocks of data over the network to Hadoop Distributed Filesystem
  (HDFS) clients.
 
-Package: hadoop-pipes
-Provides: hadoop-pipes
-Architecture: any
-Depends: hadoop (= ${source:Version})
-Description: Interface to author Hadoop MapReduce jobs in C++
- Contains Hadoop Pipes, a library which allows Hadoop MapReduce jobs to be
- written in C++.
-
 Package: libhdfs0
 Architecture: any
 Depends: hadoop (= ${source:Version}), ${shlibs:Depends}

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-doc.install Fri Mar  9 23:48:24 2012
@@ -1,3 +1 @@
-#DOCS#
-#/usr/share/doc/hadoop-doc
-
+/usr/share/doc/hadoop-doc

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs Fri Mar  9 23:48:24 2012
@@ -1,6 +1,7 @@
-/etc/conf.empty/
-/usr/lib/hadoop
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-hdfs
 /usr/bin
-/var/lib/hdfs/cache
-# /var/log/hdfs
-# /var/run/hdfs
+/var/lib/hadoop-hdfs/cache
+/var/log/hadoop-hdfs
+/var/run/hadoop-hdfs

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=1299107&r1=1299106&r2=1299107&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 Fri Mar  9 23:48:24 2012
@@ -1,21 +1,9 @@
 /etc/security/limits.d/hdfs.conf
 /etc/hadoop/conf.empty/hdfs-site.xml
-/usr/lib/hadoop/hadoop-hdfs*.jar
-/usr/lib/hadoop/hadoop-archives*.jar
+/usr/lib/hadoop-hdfs
 /usr/lib/hadoop/libexec/jsvc
 /usr/lib/hadoop/libexec/hdfs-config.sh
-/usr/lib/hadoop/webapps
-/usr/lib/hadoop/sbin/update-hdfs-env.sh
-/usr/lib/hadoop/sbin/start-secure-dns.sh
-/usr/lib/hadoop/sbin/stop-secure-dns.sh
-/usr/lib/hadoop/sbin/start-balancer.sh
-/usr/lib/hadoop/sbin/stop-balancer.sh
-/usr/lib/hadoop/sbin/start-dfs.sh
-/usr/lib/hadoop/sbin/stop-dfs.sh
-/usr/lib/hadoop/sbin/refresh-namenodes.sh
-/usr/lib/hadoop/sbin/distribute-exclude.sh
-/usr/lib/hadoop/bin/hdfs
 /usr/bin/hdfs
-# FIXME: HADOOP-7939
-/var/log/hdfs
-/var/run/hdfs
+/var/lib/hadoop-hdfs
+/var/log/hadoop-hdfs
+/var/run/hadoop-hdfs

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst Fri Mar  9 23:48:24 2012
@@ -21,12 +21,11 @@ set -e
 
 case "$1" in
     configure)
-        # FIXME: HADOOP-7939
-	# mkdir -p /var/log/hdfs /var/run/hdfs || :
-	# chgrp -R hadoop /var/log/hdfs /var/run/hdfs
-	# chmod g+w /var/run/hdfs /var/log/hdfs
-        chown hdfs:hadoop /var/lib/hdfs/ /var/lib/hdfs/cache
-	chmod 1777 /var/lib/hdfs/cache
+	mkdir -p /var/log/hadoop-hdfs /var/run/hadoop-hdfs || :
+	chgrp -R hadoop /var/log/hadoop-hdfs /var/run/hadoop-hdfs
+	chmod g+w /var/run/hadoop-hdfs /var/log/hadoop-hdfs
+	chown hdfs:hadoop /var/lib/hadoop-hdfs/ /var/lib/hadoop-hdfs/cache
+	chmod 1777 /var/lib/hadoop-hdfs/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs Fri Mar  9 23:48:24 2012
@@ -1,6 +1,7 @@
-/etc/conf.empty/
-/usr/lib/hadoop
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-mapreduce
 /usr/bin
-/var/lib/mapreduce/cache
-# /var/log/mapreduce
-# /var/run/mapreduce
+/var/lib/hadoop-mapreduce/cache
+/var/log/hadoop-mapreduce
+/var/run/hadoop-mapreduce

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install Fri Mar  9 23:48:24 2012
@@ -1,11 +1,7 @@
 /etc/security/limits.d/mapreduce.conf
-/usr/lib/hadoop/hadoop-mapreduce*.jar
-/usr/lib/hadoop/hadoop-streaming*.jar
-/usr/lib/hadoop/hadoop-extras*.jar
+/usr/lib/hadoop-mapreduce
 /usr/lib/hadoop/libexec/mapred-config.sh
-/usr/lib/hadoop/bin/mapred
-/usr/lib/hadoop/sbin/mr-jobhistory-daemon.sh
 /usr/bin/mapred
-# FIXME: HADOOP-7939
-/var/log/mapreduce
-/var/run/mapreduce
+/var/lib/hadoop-mapreduce
+/var/log/hadoop-mapreduce
+/var/run/hadoop-mapreduce

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst Fri Mar  9 23:48:24 2012
@@ -21,12 +21,11 @@ set -e
 
 case "$1" in
     configure)
-        # FIXME: HADOOP-7939
-	# mkdir -p /var/log/mapreduce /var/run/mapreduce || :
-	# chgrp -R hadoop /var/log/mapreduce /var/run/mapreduce
-	# chmod g+w /var/run/mapreduce /var/log/mapreduce
-        chown mapreduce:hadoop /var/lib/mapreduce /var/lib/mapreduce/cache
-	chmod 1777 /var/lib/mapreduce/cache
+	mkdir -p /var/log/hadoop-mapreduce /var/run/hadoop-mapreduce || :
+	chgrp -R hadoop /var/log/hadoop-mapreduce /var/run/hadoop-mapreduce
+	chmod g+w /var/run/hadoop-mapreduce /var/log/hadoop-mapreduce
+	chown mapreduce:hadoop /var/lib/hadoop-mapreduce /var/lib/hadoop-mapreduce/cache
+	chmod 1777 /var/lib/hadoop-mapreduce/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs Fri Mar  9 23:48:24 2012
@@ -1,6 +1,7 @@
-/etc/conf.empty/
-/usr/lib/hadoop
+/etc/hadoop/conf.empty/
+/usr/lib/hadoop/libexec
+/usr/lib/hadoop-yarn
 /usr/bin
-/var/lib/yarn/cache
-/var/log/yarn
-/var/run/yarn
+/var/lib/hadoop-yarn/cache
+/var/log/hadoop-yarn
+/var/run/hadoop-yarn

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.install Fri Mar  9 23:48:24 2012
@@ -1,14 +1,9 @@
 /etc/security/limits.d/yarn.conf
 /etc/hadoop/conf.empty/yarn-env.sh
 /etc/hadoop/conf.empty/yarn-site.xml
-/etc/hadoop/conf.empty/mrapp-generated-classpath
-/etc/default/yarn
-/usr/lib/hadoop/hadoop-yarn*.jar
+/usr/lib/hadoop-yarn
 /usr/lib/hadoop/libexec/yarn-config.sh
-/usr/lib/hadoop/sbin/start-yarn.sh
-/usr/lib/hadoop/sbin/stop-yarn.sh
-/usr/lib/hadoop/sbin/yarn-daemon.sh
-/usr/lib/hadoop/sbin/yarn-daemons.sh
-/usr/lib/hadoop/bin/yarn
-/usr/lib/hadoop/bin/container-executor
 /usr/bin/yarn
+/var/lib/hadoop-yarn
+/var/log/hadoop-yarn
+/var/run/hadoop-yarn

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst Fri Mar  9 23:48:24 2012
@@ -21,13 +21,13 @@ set -e
 
 case "$1" in
     configure)
-        chown root:yarn /usr/lib/hadoop/bin/container-executor
-        chmod 6050 /usr/lib/hadoop/bin/container-executor
-	mkdir -p /var/log/yarn /var/run/yarn /var/lib/yarn/cache || :
-	chgrp -R hadoop /var/log/yarn /var/run/yarn
-	chmod g+w /var/log/yarn /var/run/yarn
-        chown yarn:hadoop /var/lib/yarn/ /var/lib/yarn/cache
-	chmod 1777 /var/lib/yarn/cache
+	chown root:yarn /usr/lib/hadoop-yarn/bin/container-executor
+	chmod 6050 /usr/lib/hadoop-yarn/bin/container-executor
+	mkdir -p /var/log/hadoop-yarn /var/run/hadoop-yarn /var/lib/hadoop-yarn/cache || :
+	chgrp -R hadoop /var/log/hadoop-yarn /var/run/hadoop-yarn
+	chmod g+w /var/log/hadoop-yarn /var/run/hadoop-yarn
+	chown yarn:hadoop /var/lib/hadoop-yarn/ /var/lib/hadoop-yarn/cache
+	chmod 1777 /var/lib/hadoop-yarn/cache
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.dirs?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.dirs (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.dirs Fri Mar  9 23:48:24 2012
@@ -1,7 +1,4 @@
-/etc/conf.empty/
+/etc/hadoop/conf.empty/
 /usr/lib/hadoop
 /usr/bin
 /usr/share/doc/hadoop
-/var/lib/hadoop/cache/
-/var/log/hadoop
-/var/run/hadoop

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.install Fri Mar  9 23:48:24 2012
@@ -4,19 +4,14 @@
 /etc/hadoop/conf.empty/slaves
 /etc/hadoop/conf.empty/ssl-client.xml.example
 /etc/hadoop/conf.empty/ssl-server.xml.example
+/etc/hadoop/conf.empty/core-site.xml
 /etc/default/hadoop
-/usr/lib/hadoop/hadoop-common*.jar
-/usr/lib/hadoop/hadoop-auth*.jar
-/usr/lib/hadoop/hadoop-annotations*.jar
-/usr/lib/hadoop/lib
 /usr/lib/hadoop/etc
 /usr/lib/hadoop/libexec/hadoop-config.sh
-/usr/lib/hadoop/sbin/hadoop-*.sh
-/usr/lib/hadoop/sbin/update-hadoop-env.sh
-/usr/lib/hadoop/sbin/slaves.sh
-/usr/lib/hadoop/sbin/start-all.sh
-/usr/lib/hadoop/sbin/stop-all.sh
-/usr/lib/hadoop/bin/hadoop
-/usr/lib/hadoop/bin/rcc
+/usr/lib/hadoop/libexec/hadoop-layout.sh
+/usr/lib/hadoop/*.jar
+/usr/lib/hadoop/lib
+/usr/lib/hadoop/sbin
+/usr/lib/hadoop/bin
 /usr/bin/hadoop
 /usr/share/man/man1/hadoop.1.*

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.postinst
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.postinst?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.postinst (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop.postinst Fri Mar  9 23:48:24 2012
@@ -23,23 +23,8 @@ case "$1" in
     configure)
 	# We used to chown /usr/lib/hadoop here, but with security we don't want to do that -
 	# things like task-controller are very particular about ownership
-        chown -R root:hadoop /etc/hadoop
-	chgrp -R hadoop /var/log/hadoop /var/run/hadoop
-	chmod g+w /var/run/hadoop /var/log/hadoop 
-
-	# Change the ownership of old logs so that we don't fail rotation on next startup
-	find /var/log/hadoop/ | egrep 'jobtracker|tasktracker|userlogs|history' | xargs --no-run-if-empty chown mapred
-	find /var/log/hadoop/ | egrep 'namenode|datanode' | xargs --no-run-if-empty chown hdfs
-
-        # We don't want to do this recursively since we may be reinstalling, in which case
-        # users have their own cache/<username> directories which shouldn't be stolen
-        chown root:hadoop /var/lib/hadoop/ /var/lib/hadoop/cache/
-	chmod 1777 /var/lib/hadoop/cache/
-	mkdir -p /var/log/hadoop || :
-	touch /var/log/hadoop/SecurityAuth.audit
-        chgrp hadoop /var/log/hadoop/SecurityAuth.audit
-	chmod g+w /var/log/hadoop/SecurityAuth.audit
-        update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.empty 10
+	chown -R root:hadoop /etc/hadoop
+	update-alternatives --install /etc/hadoop/conf hadoop-conf /etc/hadoop/conf.empty 10
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Fri Mar  9 23:48:24 2012
@@ -75,6 +75,7 @@ install: build
 	  --installed-lib-dir=/usr/lib/hadoop
 
 	ln -fs /usr/lib/bigtop-utils/jsvc debian/tmp/usr/lib/hadoop/libexec/jsvc
+	ln -fs /usr/lib/bigtop-tomcat/bin debian/tmp/usr/lib/hadoop-httpfs/bin
 
 # Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg Ubuntu Hardy)
 	(dh_lintian) || /bin/true
@@ -85,6 +86,8 @@ hadoop_svcs=hdfs-namenode hdfs-secondary
 
 $(hadoop_svcs): debian/init.d.tmpl
 	bash $< debian/hadoop-$@.svc > debian/hadoop-$@.init
+	cp debian/$(firstword $(subst -, ,$@)).default debian/tmp/etc/default/hadoop-$@
+	echo /etc/default/hadoop-$@ >> debian/hadoop-$@.install
 	# FIXME: workaround for BIGTOP-105
 	[ -f debian/hadoop-$@.postinst ] || cp debian/hadoop.daemon.postinst.tpl debian/hadoop-$@.postinst
 	sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/hadoop-$@.postinst
@@ -92,9 +95,6 @@ $(hadoop_svcs): debian/init.d.tmpl
 install-indep: $(hadoop_svcs) 
 	mkdir -p debian/tmp/etc/default
 	cp debian/hadoop.default debian/tmp/etc/default/hadoop
-	cp debian/yarn.default debian/tmp/etc/default/yarn
-	cp debian/hadoop-httpfs.default debian/tmp/etc/default/hadoop-httpfs
-	cp debian/hadoop-mapreduce-historyserver.default debian/tmp/etc/default/hadoop-mapreduce-historyserver
 
 	dh_install --sourcedir=debian/tmp -i
 
@@ -103,15 +103,6 @@ install-indep: $(hadoop_svcs) 
 	rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs
 	rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/contrib/fuse-dfs
 
-	# FIXME: The following is a workaround for BIGTOP-139
-	rm -Rf debian/hadoop/usr/lib/hadoop/bin/jsvc 
-	rm -Rf debian/hadoop/usr/lib/hadoop/hdfs/bin/jsvc
-	rm -Rf debian/hadoop/usr/lib/hadoop/bin/task-controller
-
-	# FIXME: The following is a workaround for BIGTOP-139
-	rm -Rf debian/hadoop/usr/lib/hadoop/libexec/jsvc*
-	rm -Rf debian/hadoop/usr/lib/hadoop/bin/task-controller
-
 install-arch:
 	mkdir -p debian/tmp/etc/default
 	cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1299107&r1=1299106&r2=1299107&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Fri Mar  9 23:48:24 2012
@@ -31,23 +31,26 @@
 %define lib_hadoop_dirname /usr/lib
 %define lib_hadoop %{lib_hadoop_dirname}/%{name}
 %define lib_httpfs %{lib_hadoop_dirname}/%{name}-httpfs
+%define lib_hdfs %{lib_hadoop_dirname}/%{name}-hdfs
+%define lib_yarn %{lib_hadoop_dirname}/%{name}-yarn
+%define lib_mapreduce %{lib_hadoop_dirname}/%{name}-mapreduce
 %define log_hadoop_dirname /var/log
 %define log_hadoop %{log_hadoop_dirname}/%{name}
-%define log_yarn %{log_hadoop_dirname}/yarn
-%define log_hdfs %{log_hadoop_dirname}/hdfs
+%define log_yarn %{log_hadoop_dirname}/%{name}-yarn
+%define log_hdfs %{log_hadoop_dirname}/%{name}-hdfs
 %define log_httpfs %{log_hadoop_dirname}/%{name}-httpfs
-%define log_mapreduce %{log_hadoop_dirname}/mapreduce
+%define log_mapreduce %{log_hadoop_dirname}/%{name}-mapreduce
 %define run_hadoop_dirname /var/run
 %define run_hadoop %{run_hadoop_dirname}/hadoop
-%define run_yarn %{run_hadoop_dirname}/yarn
-%define run_hdfs %{run_hadoop_dirname}/hdfs
+%define run_yarn %{run_hadoop_dirname}/%{name}-yarn
+%define run_hdfs %{run_hadoop_dirname}/%{name}-hdfs
 %define run_httpfs %{run_hadoop_dirname}/%{name}-httpfs
-%define run_mapreduce %{run_hadoop_dirname}/mapreduce
+%define run_mapreduce %{run_hadoop_dirname}/%{name}-mapreduce
 %define state_hadoop_dirname /var/lib
 %define state_hadoop %{state_hadoop_dirname}/hadoop
-%define state_yarn %{state_hadoop_dirname}/yarn
-%define state_hdfs %{state_hadoop_dirname}/hdfs
-%define state_mapreduce %{state_hadoop_dirname}/mapreduce
+%define state_yarn %{state_hadoop_dirname}/%{name}-yarn
+%define state_hdfs %{state_hadoop_dirname}/%{name}-hdfs
+%define state_mapreduce %{state_hadoop_dirname}/%{name}-mapreduce
 %define bin_hadoop %{_bindir}
 %define man_hadoop %{_mandir}
 %define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
@@ -139,7 +142,7 @@ Source1: do-component-build
 Source2: install_%{name}.sh
 Source3: hadoop.default
 Source4: hadoop-fuse.default
-Source5: hadoop-httpfs.default
+Source5: httpfs.default
 Source6: hadoop.1
 Source7: hadoop-fuse-dfs.1
 Source8: hdfs.conf
@@ -153,7 +156,10 @@ Source15: hadoop-mapreduce-historyserver
 Source16: hadoop-yarn-resourcemanager.svc
 Source17: hadoop-yarn-nodemanager.svc
 Source18: hadoop-httpfs.svc
-Source19: hadoop-mapreduce-historyserver.default
+Source19: mapreduce.default
+Source20: hdfs.default
+Source21: yarn.default
+Source22: hadoop-layout.sh
 Patch0: MAPREDUCE-3890.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
@@ -395,45 +401,46 @@ bash %{SOURCE2} \
 # Replace the bundled jsvc with a link to a bigtop-jsvc one
 %__ln_s -f %{libexecdir}/bigtop-utils/jsvc $RPM_BUILD_ROOT/%{lib_hadoop}/libexec/jsvc
 
+# Provide a symlink to the bigtop-tomcat
+%__ln_s -f /usr/lib/bigtop-tomcat/bin $RPM_BUILD_ROOT/%{lib_httpfs}/bin
+
 # Init.d scripts
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
 
+# Install top level /etc/default files
+%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
+%__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
+%__cp $RPM_SOURCE_DIR/%{name}-fuse.default $RPM_BUILD_ROOT/etc/default/%{name}-fuse
+
 # Generate the init.d scripts
 for service in %{hadoop_services}
 do
        init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}
        bash $RPM_SOURCE_DIR/init.d.tmpl $RPM_SOURCE_DIR/%{name}-${service}.svc > $init_file
        chmod 755 $init_file
+       cp $RPM_SOURCE_DIR/${service/-*/}.default $RPM_BUILD_ROOT/etc/default/%{name}-${service}
+       chmod 644 $RPM_BUILD_ROOT/etc/default/%{name}-${service}
 done
 
-%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
-%__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
-%__cp $RPM_SOURCE_DIR/yarn.default $RPM_BUILD_ROOT/etc/default/yarn
-%__cp $RPM_SOURCE_DIR/%{name}-fuse.default $RPM_BUILD_ROOT/etc/default/%{name}-fuse
-%__cp $RPM_SOURCE_DIR/%{name}-httpfs.default $RPM_BUILD_ROOT/etc/default/%{name}-httpfs
-%__cp $RPM_SOURCE_DIR/%{name}-mapreduce-historyserver.default $RPM_BUILD_ROOT/etc/default/%{name}-mapreduce-historyserver
-
+# Install security limits
 %__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
 %__install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/etc/security/limits.d/hdfs.conf
 %__install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/security/limits.d/yarn.conf
 %__install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/etc/security/limits.d/mapreduce.conf
 
 # /var/lib/*/cache
-%__install -d -m 1777 $RPM_BUILD_ROOT/%{state_hadoop}/cache
 %__install -d -m 1777 $RPM_BUILD_ROOT/%{state_yarn}/cache
 %__install -d -m 1777 $RPM_BUILD_ROOT/%{state_hdfs}/cache
 %__install -d -m 1777 $RPM_BUILD_ROOT/%{state_mapreduce}/cache
 # /var/log/*
-%__install -d -m 0775 $RPM_BUILD_ROOT/%{log_hadoop}
 %__install -d -m 0775 $RPM_BUILD_ROOT/%{log_yarn}
-# %__install -d -m 0775 $RPM_BUILD_ROOT/%{log_hdfs}
-# %__install -d -m 0775 $RPM_BUILD_ROOT/%{log_mapreduce}
+%__install -d -m 0775 $RPM_BUILD_ROOT/%{log_hdfs}
+%__install -d -m 0775 $RPM_BUILD_ROOT/%{log_mapreduce}
 %__install -d -m 0775 $RPM_BUILD_ROOT/%{log_httpfs}
 # /var/run/*
-%__install -d -m 0775 $RPM_BUILD_ROOT/%{run_hadoop}
 %__install -d -m 0775 $RPM_BUILD_ROOT/%{run_yarn}
-#%__install -d -m 0775 $RPM_BUILD_ROOT/%{run_hdfs}
-#%__install -d -m 0775 $RPM_BUILD_ROOT/%{run_mapreduce}
+%__install -d -m 0775 $RPM_BUILD_ROOT/%{run_hdfs}
+%__install -d -m 0775 $RPM_BUILD_ROOT/%{run_mapreduce}
 %__install -d -m 0775 $RPM_BUILD_ROOT/%{run_httpfs}
 
 %pre
@@ -457,16 +464,6 @@ getent passwd mapreduce >/dev/null || /u
 
 %post
 %{alternatives_cmd} --install %{config_hadoop} %{name}-conf %{etc_hadoop}/conf.empty 10
-#%{alternatives_cmd} --install %{config_yarn} yarn-conf %{etc_yarn}/conf.empty 10
-%{alternatives_cmd} --install %{bin_hadoop}/%{hadoop_name} %{hadoop_name}-default %{bin_hadoop}/%{name} 20 \
-  --slave %{log_hadoop_dirname}/%{hadoop_name} %{hadoop_name}-log %{log_hadoop} \
-  --slave %{lib_hadoop_dirname}/%{hadoop_name} %{hadoop_name}-lib %{lib_hadoop} \
-  --slave /etc/%{hadoop_name} %{hadoop_name}-etc %{etc_hadoop} \
-  --slave %{man_hadoop}/man1/%{hadoop_name}.1.*z %{hadoop_name}-man %{man_hadoop}/man1/%{name}.1.*z
-
-touch %{log_hadoop}/SecurityAuth.audit
-chgrp hadoop %{log_hadoop}/SecurityAuth.audit
-chmod g+w %{log_hadoop}/SecurityAuth.audit
 
 %post httpfs
 %{alternatives_cmd} --install %{config_httpfs} %{name}-httpfs-conf %{etc_httpfs}/conf.empty 10
@@ -480,7 +477,6 @@ if [ "$1" = 0 ]; then
      service hadoop-$service stop 1>/dev/null 2>/dev/null || :
   done
   %{alternatives_cmd} --remove %{name}-conf %{etc_hadoop}/conf.empty || :
-  %{alternatives_cmd} --remove %{hadoop_name}-default %{bin_hadoop}/%{name} || :
 fi
 
 %preun httpfs
@@ -500,17 +496,10 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{etc_hadoop}/conf.empty/yarn-env.sh
 %config(noreplace) %{etc_hadoop}/conf.empty/yarn-site.xml
-%config(noreplace) %{etc_hadoop}/conf.empty/mrapp-generated-classpath
-%config(noreplace) /etc/default/yarn
 %config(noreplace) /etc/security/limits.d/yarn.conf
-%{lib_hadoop}/hadoop-yarn*.jar
 %{lib_hadoop}/libexec/yarn-config.sh
-%{lib_hadoop}/sbin/start-yarn.sh
-%{lib_hadoop}/sbin/stop-yarn.sh
-%{lib_hadoop}/sbin/yarn-daemon.sh
-%{lib_hadoop}/sbin/yarn-daemons.sh
-%{lib_hadoop}/bin/yarn
-%attr(6050,root,yarn) %{lib_hadoop}/bin/container-executor
+%{lib_yarn}
+%attr(6050,root,yarn) %{lib_yarn}/bin/container-executor
 %{bin_hadoop}/yarn
 %attr(0775,yarn,hadoop) %{run_yarn}
 %attr(0775,yarn,hadoop) %{log_yarn}
@@ -522,21 +511,9 @@ fi
 %config(noreplace) %{etc_hadoop}/conf.empty/hdfs-site.xml
 %config(noreplace) /etc/default/hadoop-fuse
 %config(noreplace) /etc/security/limits.d/hdfs.conf
-%{lib_hadoop}/hadoop-hdfs*.jar
-%{lib_hadoop}/hadoop-archives*.jar
+%{lib_hdfs}
 %{lib_hadoop}/libexec/hdfs-config.sh
 %{lib_hadoop}/libexec/jsvc
-%{lib_hadoop}/webapps
-%{lib_hadoop}/sbin/update-hdfs-env.sh
-%{lib_hadoop}/sbin/start-secure-dns.sh
-%{lib_hadoop}/sbin/stop-secure-dns.sh
-%{lib_hadoop}/sbin/start-balancer.sh
-%{lib_hadoop}/sbin/stop-balancer.sh
-%{lib_hadoop}/sbin/start-dfs.sh
-%{lib_hadoop}/sbin/stop-dfs.sh
-%{lib_hadoop}/sbin/refresh-namenodes.sh
-%{lib_hadoop}/sbin/distribute-exclude.sh
-%{lib_hadoop}/bin/hdfs
 %{bin_hadoop}/hdfs
 %attr(0775,hdfs,hadoop) %{run_hdfs}
 %attr(0775,hdfs,hadoop) %{log_hdfs}
@@ -545,16 +522,9 @@ fi
 
 %files mapreduce
 %defattr(-,root,root)
-%config(noreplace) /etc/default/hadoop-mapreduce-historyserver
 %config(noreplace) /etc/security/limits.d/mapreduce.conf
-%{lib_hadoop}/hadoop-mapreduce*.jar
-%{lib_hadoop}/hadoop-streaming*.jar
-%{lib_hadoop}/hadoop-extras*.jar
-%{lib_hadoop}/hadoop-distcp*.jar
-%{lib_hadoop}/hadoop-rumen*.jar
+%{lib_mapreduce}
 %{lib_hadoop}/libexec/mapred-config.sh
-%{lib_hadoop}/bin/mapred
-%{lib_hadoop}/sbin/mr-jobhistory-daemon.sh
 %{bin_hadoop}/mapred
 %attr(0775,mapreduce,hadoop) %{run_mapreduce}
 %attr(0775,mapreduce,hadoop) %{log_mapreduce}
@@ -572,25 +542,15 @@ fi
 %config(noreplace) %{etc_hadoop}/conf.empty/ssl-client.xml.example
 %config(noreplace) %{etc_hadoop}/conf.empty/ssl-server.xml.example
 %config(noreplace) /etc/default/hadoop
-%{lib_hadoop}/hadoop-common*.jar
-%{lib_hadoop}/hadoop-auth*.jar
-%{lib_hadoop}/hadoop-annotations*.jar
+%{lib_hadoop}/*.jar
 %{lib_hadoop}/lib
+%{lib_hadoop}/sbin
+%{lib_hadoop}/bin
 %{lib_hadoop}/etc
 %{lib_hadoop}/libexec/hadoop-config.sh
-%{lib_hadoop}/sbin/hadoop-*.sh
-%{lib_hadoop}/sbin/update-hadoop-env.sh
-%{lib_hadoop}/sbin/slaves.sh
-%{lib_hadoop}/sbin/start-all.sh
-%{lib_hadoop}/sbin/stop-all.sh
-%{lib_hadoop}/bin/hadoop
-%{lib_hadoop}/bin/rcc
+%{lib_hadoop}/libexec/hadoop-layout.sh
 %{bin_hadoop}/hadoop
 %{man_hadoop}/man1/hadoop.1.*
-%attr(0775,root,hadoop) %{run_hadoop}
-%attr(0775,root,hadoop) %{log_hadoop}
-%attr(0775,root,hadoop) %{state_hadoop}
-%attr(1777,root,hadoop) %{state_hadoop}/cache
 
 %files doc
 %defattr(-,root,root)
@@ -600,6 +560,7 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{etc_httpfs}/conf.empty
 %config(noreplace) /etc/default/%{name}-httpfs
+%{lib_hadoop}/libexec/httpfs-config.sh
 %{initd_dir}/%{name}-httpfs
 %{lib_httpfs}
 %attr(0775,httpfs,httpfs) %{run_httpfs}
@@ -610,6 +571,7 @@ fi
 %files %1 \
 %defattr(-,root,root) \
 %{initd_dir}/%{name}-%1 \
+/etc/default/%{name}-%1 \
 %post %1 \
 chkconfig --add %{name}-%1 \
 \
@@ -634,7 +596,6 @@ fi
 # Pseudo-distributed Hadoop installation
 %post conf-pseudo
 %{alternatives_cmd} --install %{config_hadoop} %{name}-conf %{etc_hadoop}/conf.pseudo 30
-#%{alternatives_cmd} --install %{config_yarn} yarn-conf %{etc_yarn}/conf.pseudo 30
 
 %preun conf-pseudo
 if [ "$1" = 0 ]; then
@@ -645,9 +606,6 @@ fi
 %files conf-pseudo
 %defattr(-,root,root)
 %config(noreplace) %attr(755,root,root) %{etc_hadoop}/conf.pseudo
-#%config(noreplace) %attr(755,root,root) %{etc_yarn}/conf.pseudo
-%dir %attr(0755,root,hadoop) /var/lib/%{name}
-%dir %attr(1777,root,hadoop) /var/lib/%{name}/cache
 
 %files libhdfs
 %defattr(-,root,root)



Mime
View raw message