From 6316e662791c3fe19ce43550a57ae4e9beac05ad Mon Sep 17 00:00:00 2001
From: Arun Murthy <acmurthy@apache.org>
Date: Thu, 25 Aug 2011 00:20:52 +0000
Subject: [PATCH] HADOOP-7560. Change src layout to be heirarchical.
 Contributed by Alejandro Abdelnur.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161335 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop-annotations/pom.xml                |  2 +-
 hadoop-common-project/hadoop-auth/pom.xml     |  2 +-
 hadoop-common-project/hadoop-common/pom.xml   |  2 +-
 hadoop-common-project/pom.xml                 | 56 +++++++++++++++++++
 hadoop-hdfs-project/hadoop-hdfs/pom.xml       |  2 +-
 hadoop-hdfs-project/pom.xml                   | 54 ++++++++++++++++++
 hadoop-mapreduce-project/pom.xml              |  2 +-
 pom.xml                                       |  7 +--
 8 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 hadoop-common-project/pom.xml
 create mode 100644 hadoop-hdfs-project/pom.xml

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 6c9313f859e..c0ef494fb8b 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project</relativePath>
+    <relativePath>../../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-annotations</artifactId>
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index 105ba766546..5bd36156aec 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project</relativePath>
+    <relativePath>../../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-alfredo</artifactId>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 82e02d1e219..821a2423b4e 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project-dist</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project-dist</relativePath>
+    <relativePath>../../hadoop-project-dist</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-common</artifactId>
diff --git a/hadoop-common-project/pom.xml b/hadoop-common-project/pom.xml
new file mode 100644
index 00000000000..83190d67b40
--- /dev/null
+++ b/hadoop-common-project/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-common-project</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop Common Project</description>
+  <name>Apache Hadoop Common Project</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>hadoop-auth</module>
+    <module>hadoop-common</module>
+    <module>hadoop-annotations</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>pom.xml</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 999a004ada5..746a28ec580 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project-dist</artifactId>
     <version>0.23.0-SNAPSHOT</version>
-    <relativePath>../hadoop-project-dist</relativePath>
+    <relativePath>../../hadoop-project-dist</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-hdfs</artifactId>
diff --git a/hadoop-hdfs-project/pom.xml b/hadoop-hdfs-project/pom.xml
new file mode 100644
index 00000000000..7ab408acf38
--- /dev/null
+++ b/hadoop-hdfs-project/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed 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. See accompanying LICENSE file.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-project</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+    <relativePath>../hadoop-project</relativePath>
+  </parent>
+  <groupId>org.apache.hadoop</groupId>
+  <artifactId>hadoop-hdfs-project</artifactId>
+  <version>0.23.0-SNAPSHOT</version>
+  <description>Apache Hadoop HDFS Project</description>
+  <name>Apache Hadoop HDFS Project</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>hadoop-hdfs</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>pom.xml</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index f0234e62280..5b237381d03 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -363,7 +363,7 @@
 
   <modules>
     <module>hadoop-yarn</module>
-    <module>hadoop-mr-client</module>
+    <module>hadoop-mapreduce-client</module>
   </modules>
 
   <reporting>
diff --git a/pom.xml b/pom.xml
index 1587282095f..f55210736d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,10 +37,9 @@
     <module>hadoop-project</module>
     <module>hadoop-project-dist</module>
     <module>hadoop-assemblies</module>
-    <module>hadoop-annotations</module>
-    <module>hadoop-alfredo</module>
-    <module>hadoop-common</module>
-    <module>hadoop-hdfs</module>
+    <module>hadoop-common-project</module>
+    <module>hadoop-hdfs-project</module>
+    <module>hadoop-mapreduce-project</module>
   </modules>
 
   <build>