From 14b97a91d9a7d721bd1dc276640dcf9c99af188e Mon Sep 17 00:00:00 2001
From: Thomas White <tomwhite@apache.org>
Date: Mon, 22 Aug 2011 17:40:58 +0000
Subject: [PATCH] HADOOP-7496. Break Maven TAR & bintar profiles into just
 LAYOUT & TAR proper. Contributed by Alejandro Abdelnur.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1160344 13f79535-47bb-0310-9956-ffa450edef68
---
 BUILDING.txt                                  | 20 +++++++++-------
 .../{hadoop-tar.xml => hadoop-dist.xml}       |  2 +-
 hadoop-common/CHANGES.txt                     |  3 +++
 hadoop-common/pom.xml                         |  4 ++--
 hadoop-hdfs/pom.xml                           |  4 ++--
 .../README.txt                                |  2 +-
 .../pom.xml                                   | 24 +++++++++----------
 pom.xml                                       |  2 +-
 8 files changed, 33 insertions(+), 28 deletions(-)
 rename hadoop-assemblies/src/main/resources/assemblies/{hadoop-tar.xml => hadoop-dist.xml} (99%)
 rename {hadoop-project-distro => hadoop-project-dist}/README.txt (58%)
 rename {hadoop-project-distro => hadoop-project-dist}/pom.xml (96%)

diff --git a/BUILDING.txt b/BUILDING.txt
index 01b2a68424..d0b9aa2894 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -15,12 +15,13 @@ Requirements:
 ----------------------------------------------------------------------------------
 Maven modules:
 
-  hadoop                      (Main Hadoop project)
-         - hadoop-project     (Parent POM for all Hadoop Maven modules.             )
-                              (All plugins & dependencies versions are defined here.)
-         - hadoop-annotations (Generates the Hadoop doclet used to generated the Javadocs)
-         - hadoop-common      (Hadoop Common)
-         - hadoop-hdfs        (Hadoop HDFS)
+  hadoop                       (Main Hadoop project)
+         - hadoop-project      (Parent POM for all Hadoop Maven modules.             )
+                               (All plugins & dependencies versions are defined here.)
+         - hadoop-project-dist (Parent POM for modules that generate distributions.)
+         - hadoop-annotations  (Generates the Hadoop doclet used to generated the Javadocs)
+         - hadoop-common       (Hadoop Common)
+         - hadoop-hdfs         (Hadoop HDFS)
 
 ----------------------------------------------------------------------------------
 Where to run Maven from?
@@ -43,15 +44,16 @@ Maven build goals:
  * Run clover                : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
  * Run Rat                   : mvn apache-rat:check
  * Build javadocs            : mvn javadoc:javadoc
- * Build TAR                 : mvn package [-Ptar][-Pdocs][-Psrc][-Pnative]
+ * Build distribution        : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar]
 
  Build options:
 
   * Use -Pnative to compile/bundle native code
   * Use -Dsnappy.prefix=(/usr/local) & -Dbundle.snappy=(false) to compile
     Snappy JNI bindings and to bundle Snappy SO files
-  * Use -Pdocs to generate & bundle the documentation in the TAR (using -Ptar)
-  * Use -Psrc to bundle the source in the TAR (using -Ptar)
+  * Use -Pdocs to generate & bundle the documentation in the distribution (using -Pdist)
+  * Use -Psrc to bundle the source in the distribution (using -Pdist)
+  * Use -Dtar to create a TAR with the distribution (using -Pdist)
 
    Tests options:
 
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
similarity index 99%
rename from hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
rename to hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
index 88ed8b0edf..02c104bbfb 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <assembly>
-  <id>hadoop-bintar</id>
+  <id>hadoop-distro</id>
   <formats>
     <format>dir</format>
   </formats>
diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt
index 0485e37bef..058d1a66d9 100644
--- a/hadoop-common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -337,6 +337,9 @@ Trunk (unreleased changes)
     HADOOP-7498. Remove legacy TAR layout creation. (Alejandro Abdelnur via
     tomwhite)
 
+    HADOOP-7496. Break Maven TAR & bintar profiles into just LAYOUT & TAR proper.
+    (Alejandro Abdelnur via tomwhite)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/hadoop-common/pom.xml b/hadoop-common/pom.xml
index 11d773590c..82e02d1e21 100644
--- a/hadoop-common/pom.xml
+++ b/hadoop-common/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-project-distro</artifactId>
+    <artifactId>hadoop-project-dist</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project-distro</relativePath>
+    <relativePath>../hadoop-project-dist</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-common</artifactId>
diff --git a/hadoop-hdfs/pom.xml b/hadoop-hdfs/pom.xml
index 40ac8504a1..999a004ada 100644
--- a/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs/pom.xml
@@ -16,9 +16,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-project-distro</artifactId>
+    <artifactId>hadoop-project-dist</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project-distro</relativePath>
+    <relativePath>../hadoop-project-dist</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-hdfs</artifactId>
diff --git a/hadoop-project-distro/README.txt b/hadoop-project-dist/README.txt
similarity index 58%
rename from hadoop-project-distro/README.txt
rename to hadoop-project-dist/README.txt
index ee63a1c3df..a4c759720f 100644
--- a/hadoop-project-distro/README.txt
+++ b/hadoop-project-dist/README.txt
@@ -1,4 +1,4 @@
 DUMMY.
 
 Required for the assembly:single goal not to fail because there
-are not files in the hadoop-project-distro module.
+are not files in the hadoop-project-dist module.
diff --git a/hadoop-project-distro/pom.xml b/hadoop-project-dist/pom.xml
similarity index 96%
rename from hadoop-project-distro/pom.xml
rename to hadoop-project-dist/pom.xml
index 761e116f61..72768104d6 100644
--- a/hadoop-project-distro/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -21,10 +21,10 @@
     <relativePath>../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-project-distro</artifactId>
+  <artifactId>hadoop-project-dist</artifactId>
   <version>0.23.0-SNAPSHOT</version>
-  <description>Apache Hadoop Project Distro POM</description>
-  <name>Apache Hadoop Project Distro POM</name>
+  <description>Apache Hadoop Project Dist POM</description>
+  <name>Apache Hadoop Project Dist POM</name>
   <packaging>pom</packaging>
 
   <properties>
@@ -356,7 +356,7 @@
     </profile>
 
     <profile>
-      <id>tar</id>
+      <id>dist</id>
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
@@ -367,7 +367,7 @@
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>pre-tar</id>
+                <id>pre-dist</id>
                 <phase>prepare-package</phase>
                 <goals>
                   <goal>run</goal>
@@ -375,7 +375,7 @@
                 <configuration>
                   <target>
                     <!-- Using Unix script to preserve symlinks -->
-                    <echo file="${project.build.directory}/tar-copynativelibs.sh">
+                    <echo file="${project.build.directory}/dist-copynativelibs.sh">
 
                       which cygpath 2> /dev/null
                       if [ $? = 1 ]; then
@@ -398,7 +398,7 @@
                       fi
                     </echo>
                     <exec executable="sh" dir="${project.build.directory}" failonerror="true">
-                      <arg line="./tar-copynativelibs.sh"/>
+                      <arg line="./dist-copynativelibs.sh"/>
                     </exec>
                   </target>
                 </configuration>
@@ -410,9 +410,9 @@
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <target>
+                  <target if="tar">
                     <!-- Using Unix script to preserve symlinks -->
-                    <echo file="${project.build.directory}/tar-maketar.sh">
+                    <echo file="${project.build.directory}/dist-maketar.sh">
 
                       which cygpath 2> /dev/null
                       if [ $? = 1 ]; then
@@ -424,7 +424,7 @@
                       tar czf ${project.artifactId}-${project.version}.tar.gz ${project.artifactId}-${project.version}
                     </echo>
                     <exec executable="sh" dir="${project.build.directory}" failonerror="true">
-                      <arg line="./tar-maketar.sh"/>
+                      <arg line="./dist-maketar.sh"/>
                     </exec>
                   </target>
                 </configuration>
@@ -443,7 +443,7 @@
             </dependencies>
             <executions>
               <execution>
-                <id>pre-tar</id>
+                <id>dist</id>
                 <phase>prepare-package</phase>
                 <goals>
                   <goal>single</goal>
@@ -453,7 +453,7 @@
                   <attach>false</attach>
                   <finalName>${project.artifactId}-${project.version}</finalName>
                   <descriptorRefs>
-                    <descriptorRef>hadoop-tar</descriptorRef>
+                    <descriptorRef>hadoop-dist</descriptorRef>
                   </descriptorRefs>
                 </configuration>
               </execution>
diff --git a/pom.xml b/pom.xml
index f049795859..1587282095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 
   <modules>
     <module>hadoop-project</module>
-    <module>hadoop-project-distro</module>
+    <module>hadoop-project-dist</module>
     <module>hadoop-assemblies</module>
     <module>hadoop-annotations</module>
     <module>hadoop-alfredo</module>