hadoop/hadoop-no-download-tomcat.patch

62 lines
3.0 KiB
Diff
Raw Normal View History

2013-08-20 20:06:04 +00:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index d83e601..480e2ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -515,56 +515,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>dist</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <target>
- <mkdir dir="downloads"/>
- <get
- src="${tomcat.download.url}"
- dest="downloads/apache-tomcat-${tomcat.version}.tar.gz" verbose="true" skipexisting="true"/>
- <delete dir="${project.build.directory}/tomcat.exp"/>
- <mkdir dir="${project.build.directory}/tomcat.exp"/>
-
- <!-- Using Unix script to preserve file permissions -->
- <echo file="${project.build.directory}/tomcat-untar.sh">
-
- which cygpath 2&gt; /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
- cd $BUILD_DIR/tomcat.exp
- tar xzf ${basedir}/downloads/apache-tomcat-${tomcat.version}.tar.gz
- </echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="true">
- <arg line="./tomcat-untar.sh"/>
- </exec>
-
- <move file="${project.build.directory}/tomcat.exp/apache-tomcat-${tomcat.version}"
- tofile="${httpfs.tomcat.dist.dir}"/>
- <delete dir="${project.build.directory}/tomcat.exp"/>
- <delete dir="${httpfs.tomcat.dist.dir}/webapps"/>
- <mkdir dir="${httpfs.tomcat.dist.dir}/webapps"/>
- <delete file="${httpfs.tomcat.dist.dir}/conf/server.xml"/>
- <copy file="${basedir}/src/main/tomcat/server.xml"
- toDir="${httpfs.tomcat.dist.dir}/conf"/>
- <copy file="${basedir}/src/main/tomcat/logging.properties"
- toDir="${httpfs.tomcat.dist.dir}/conf"/>
- <copy toDir="${httpfs.tomcat.dist.dir}/webapps/ROOT">
- <fileset dir="${basedir}/src/main/tomcat/ROOT"/>
- </copy>
- <copy toDir="${httpfs.tomcat.dist.dir}/webapps/webhdfs">
- <fileset dir="${project.build.directory}/webhdfs"/>
- </copy>
- </target>
- </configuration>
- </execution>
- <execution>
<id>tar</id>
<phase>package</phase>
<goals>