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 bo...@apache.org on 2012/08/09 00:07:00 UTC
svn commit: r1370990 - in /hadoop/common/branches/branch-0.23: ./
dev-support/ hadoop-assemblies/src/main/resources/assemblies/ hadoop-dist/
Author: bobby
Date: Wed Aug 8 22:06:59 2012
New Revision: 1370990
URL: http://svn.apache.org/viewvc?rev=1370990&view=rev
Log:
YARN-1. Move YARN out of hadoop-mapreduce
Added:
hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Modified:
hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
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
hadoop/common/branches/branch-0.23/pom.xml
Modified: hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh?rev=1370990&r1=1370989&r2=1370990&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh (original)
+++ hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh Wed Aug 8 22:06:59 2012
@@ -78,15 +78,15 @@ if $PATCH -p0 -E --dry-run < $PATCH_FILE
if [[ -d hadoop-common-project ]]; then
echo Looks like this is being run at project root
- # if all of the lines start with hadoop-common/, hadoop-hdfs/, or hadoop-mapreduce/, this is
+ # if all of the lines start with hadoop-common/, hadoop-hdfs/, hadoop-yarn/ or hadoop-mapreduce/, this is
# relative to the hadoop root instead of the subproject root, so we need
# to chop off another layer
- elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-mapreduce-project)$ ]]; then
+ elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-yarn-project|hadoop-mapreduce-project)$ ]]; then
echo Looks like this is relative to project root. Increasing PLEVEL
PLEVEL=$[$PLEVEL + 1]
- elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-mapreduce-project' ; then
+ elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-yarn-project\|hadoop-mapreduce-project' ; then
echo Looks like this is a cross-subproject patch. Try applying from the project root
cleanup 1
fi
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=1370990&r1=1370989&r2=1370990&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 Wed Aug 8 22:06:59 2012
@@ -24,19 +24,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>yarn</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
@@ -53,25 +40,6 @@
<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>bin</directory>
<outputDirectory>sbin</outputDirectory>
<includes>
@@ -80,7 +48,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>hadoop-yarn/conf</directory>
+ <directory>conf</directory>
<outputDirectory>etc/hadoop</outputDirectory>
<includes>
<include>**/*</include>
Added: hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml?rev=1370990&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml (added)
+++ hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml Wed Aug 8 22:06:59 2012
@@ -0,0 +1,145 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>hadoop-yarn-dist</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>hadoop-yarn/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>yarn</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>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>
+ <binaries>
+ <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.hadoop:hadoop-yarn-server-tests</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>tests</attachmentClassifier>
+ <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <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>
+ <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
+ <!-- use slf4j from common to avoid multiple binding warnings -->
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.hsqldb:hsqldb</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/share/hadoop/${hadoop.component}/lib-examples</outputDirectory>
+ <includes>
+ <include>org.hsqldb:hsqldb</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
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=1370990&r1=1370989&r2=1370990&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Wed Aug 8 22:06:59 2012
@@ -120,6 +120,7 @@
run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
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-yarn-project/target/hadoop-yarn-project-${project.version}/* .
run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* .
echo
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1370990&r1=1370989&r2=1370990&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Wed Aug 8 22:06:59 2012
@@ -79,6 +79,7 @@
<module>hadoop-assemblies</module>
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
+ <module>hadoop-yarn-project</module>
<module>hadoop-mapreduce-project</module>
<module>hadoop-tools</module>
<module>hadoop-dist</module>