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 br...@apache.org on 2013/08/21 19:54:08 UTC
svn commit: r1516232 - in /hadoop/common/trunk:
hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
hadoop-dist/pom.xml
Author: brandonli
Date: Wed Aug 21 17:54:08 2013
New Revision: 1516232
URL: http://svn.apache.org/r1516232
Log:
HDFS-5069 Include hadoop-nfs and hadoop-hdfs-nfs into hadoop dist for NFS deployment. Contributed by Brandon Li
Added:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
Modified:
hadoop/common/trunk/hadoop-dist/pom.xml
Added: hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml?rev=1516232&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml (added)
+++ hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml Wed Aug 21 17:54:08 2013
@@ -0,0 +1,48 @@
+<?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.
+-->
+<assembly>
+ <id>hadoop-hdfs-nfs-dist</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/share/hadoop/hdfs</outputDirectory>
+ <includes>
+ <include>${project.artifactId}-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/share/hadoop/hdfs/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>
+ </dependencySets>
+
+</assembly>
+
Added: hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml?rev=1516232&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml (added)
+++ hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml Wed Aug 21 17:54:08 2013
@@ -0,0 +1,48 @@
+<?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.
+-->
+<assembly>
+ <id>hadoop-nfs-dist</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/share/hadoop/common</outputDirectory>
+ <includes>
+ <include>${project.artifactId}-${project.version}.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/share/hadoop/common/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>
+ </dependencySets>
+
+</assembly>
+
Modified: hadoop/common/trunk/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-dist/pom.xml?rev=1516232&r1=1516231&r2=1516232&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-dist/pom.xml (original)
+++ hadoop/common/trunk/hadoop-dist/pom.xml Wed Aug 21 17:54:08 2013
@@ -115,8 +115,10 @@
run mkdir hadoop-${project.version}
run cd hadoop-${project.version}
run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
+ run cp -r $ROOT/hadoop-common-project/hadoop-nfs/target/hadoop-nfs-${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-hdfs-project/hadoop-hdfs-nfs/target/hadoop-hdfs-nfs-${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}/* .