You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2011/12/16 10:17:00 UTC
svn commit: r1215066 - in /hadoop/common/branches/branch-0.23:
hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop-dist/pom.xml
Author: mahadev
Date: Fri Dec 16 09:17:00 2011
New Revision: 1215066
URL: http://svn.apache.org/viewvc?rev=1215066&view=rev
Log:
MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) - Merging r1215065 from trunk
Modified:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1215066&r1=1215065&r2=1215066&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Fri Dec 16 09:17:00 2011
@@ -22,7 +22,6 @@
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <!-- TODO: this layout is wrong. We need module specific bin files in module specific dirs -->
<fileSets>
<fileSet>
<directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
@@ -33,7 +32,7 @@
<directory>hadoop-yarn/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>*</include>
+ <include>yarn</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@@ -41,17 +40,81 @@
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>*</include>
+ <include>mapred</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>bin</directory>
+ <outputDirectory>libexec</outputDirectory>
+ <includes>
+ <include>mapred-config.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/bin</directory>
+ <outputDirectory>libexec</outputDirectory>
+ <includes>
+ <include>yarn-config.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/bin</directory>
+ <outputDirectory>sbin</outputDirectory>
+ <includes>
+ <include>yarn-daemon.sh</include>
+ <include>yarn-daemons.sh</include>
+ <include>start-yarn.sh</include>
+ <include>stop-yarn.sh</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>hadoop-yarn/conf</directory>
- <outputDirectory>conf</outputDirectory>
+ <outputDirectory>etc/hadoop</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/webapps</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/conf</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
+ <includes>
+ <include>*-site.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/packages/templates/conf</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/templates/conf</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/dev-support/jdiff</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site/jdiff/xml</directory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site</directory>
+ <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+ </fileSet>
</fileSets>
<moduleSets>
<moduleSet>
@@ -59,7 +122,7 @@
<exclude>org.apache.hadoop:hadoop-yarn-server-tests</exclude>
</excludes>
<binaries>
- <outputDirectory>modules</outputDirectory>
+ <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
</binaries>
@@ -68,7 +131,7 @@
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
<!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
<excludes>
<exclude>org.apache.hadoop:hadoop-common</exclude>
Modified: hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml?rev=1215066&r1=1215065&r2=1215066&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Fri Dec 16 09:17:00 2011
@@ -76,6 +76,9 @@
<id>dist</id>
<activation>
<activeByDefault>false</activeByDefault>
+ <property>
+ <name>tar|rpm|deb</name>
+ </property>
</activation>
<build>
<plugins>
@@ -114,15 +117,6 @@
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
- COMMON_LIB=share/hadoop/common/lib
- MODULES=../../../../modules
- run ln -s $MODULES/hadoop-mapreduce-client-app-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-yarn-api-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-mapreduce-client-common-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-yarn-common-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-mapreduce-client-core-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-yarn-server-common-${project.version}.jar $COMMON_LIB
- run ln -s $MODULES/hadoop-mapreduce-client-jobclient-${project.version}.jar $COMMON_LIB
echo
echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
echo