From 2d06ac8a284a0cb459dba3ccc9c2f425ffb715d0 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 28 Oct 2011 21:34:14 +0000
Subject: [PATCH] Merge -r 1180115:1180116 from trunk to branch. FIXES:
 MAPREDUCE-3014

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190594 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                          | 3 +++
 hadoop-mapreduce-project/hadoop-yarn/README                   | 3 +--
 .../hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml | 4 ++--
 .../hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm        | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index c0c3d4daf98..f1261bd8167 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -391,6 +391,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the
     JobHistoryServer. (Siddharth Seth via vinodkv)
 
+    MAPREDUCE-3014. Rename and invert logic of '-cbuild' profile to 'native' and off 
+    by default. (tucu)
+
   OPTIMIZATIONS
 
     MAPREDUCE-2026. Make JobTracker.getJobCounters() and
diff --git a/hadoop-mapreduce-project/hadoop-yarn/README b/hadoop-mapreduce-project/hadoop-yarn/README
index 713871ab768..b15870fa83a 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/README
+++ b/hadoop-mapreduce-project/hadoop-yarn/README
@@ -25,10 +25,9 @@ clean workspace: mvn clean
 compile and test: mvn install
 skip tests: mvn install -DskipTests
 skip test execution but compile: mvn install -Dmaven.test.skip.exec=true
-skip native build: mvn -fn install -P-cbuild
 clean and test: mvn clean install
 run selected test after compile: mvn test -Dtest=TestClassName (combined: mvn clean install -Dtest=TestClassName)
-create runnable binaries after install: mvn assembly:assembly (combined: mvn clean install assembly:assembly)
+create runnable binaries after install: mvn assembly:assembly -Pnative (combined: mvn clean install assembly:assembly -Pnative)
 
 Eclipse Projects
 ----------------
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index f0145db22cd..b3e30bddaef 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -38,7 +38,7 @@
 
   <profiles>
     <profile>
-      <id>cbuild</id>
+      <id>native</id>
       <build>
         <plugins>
           <plugin>
@@ -117,7 +117,7 @@
         </plugins>
       </build>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <activeByDefault>false</activeByDefault>
       </activation>
     </profile>
     <profile>
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm
index 9c93203fca5..2f7233824c5 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm
@@ -28,11 +28,11 @@ Hadoop MapReduce Next Generation - Setting up a Single Node Cluster.
 +---+
 $ mvn clean install -DskipTests
 $ cd hadoop-mapreduce-project
-$ mvn clean install assembly:assembly 
+$ mvn clean install assembly:assembly -Pnative
 +---+
   <<NOTE:>> You will need protoc installed of version 2.4.1 or greater.
 
-  To ignore the native builds in mapreduce you can use <<<-P-cbuild>>> argument
+  To ignore the native builds in mapreduce you can omit the <<<-Pnative>>> argument
   for maven. The tarball should be available in <<<target/>>> directory.