Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7094. hadoop.css got lost during project split. Contributed by Konstantin Boudnik. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1071021 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Boudnik 2011-02-15 19:30:12 +00:00
parent ae8b2310d8
commit e59ee1b4a8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -491,6 +491,8 @@ Release 0.22.0 - Unreleased
HADOOP-7140. IPC Reader threads do not stop when server stops (todd) HADOOP-7140. IPC Reader threads do not stop when server stops (todd)
HADOOP-7094. hadoop.css got lost during project split (cos)
Release 0.21.1 - Unreleased Release 0.21.1 - Unreleased
IMPROVEMENTS IMPROVEMENTS

11
build.xml
View File

@ -43,6 +43,7 @@
<property name="docs.src" value="${basedir}/src/docs"/> <property name="docs.src" value="${basedir}/src/docs"/>
<property name="src.docs.cn" value="${basedir}/src/docs/cn"/> <property name="src.docs.cn" value="${basedir}/src/docs/cn"/>
<property name="changes.src" value="${docs.src}/changes"/> <property name="changes.src" value="${docs.src}/changes"/>
<property name="src.webapps" value="${basedir}/src/webapps"/>
<property name="build.dir" value="${basedir}/build"/> <property name="build.dir" value="${basedir}/build"/>
<property name="build.classes" value="${build.dir}/classes"/> <property name="build.classes" value="${build.dir}/classes"/>
@ -274,6 +275,12 @@
</touch> </touch>
<delete file="${touch.temp.file}"/> <delete file="${touch.temp.file}"/>
<!-- copy all of the jsp and static files --> <!-- copy all of the jsp and static files -->
<copy todir="${build.webapps}">
<fileset dir="${src.webapps}">
<exclude name="**/*.jsp" />
<exclude name="**/*.jspx" />
</fileset>
</copy>
<copy todir="${conf.dir}" verbose="true"> <copy todir="${conf.dir}" verbose="true">
<fileset dir="${conf.dir}" includes="**/*.template"/> <fileset dir="${conf.dir}" includes="**/*.template"/>
@ -1118,6 +1125,10 @@
<fileset file="${contrib.dir}/build.xml"/> <fileset file="${contrib.dir}/build.xml"/>
</subant> </subant>
<copy todir="${dist.dir}/webapps">
<fileset dir="${build.webapps}"/>
</copy>
<copy todir="${dist.dir}"> <copy todir="${dist.dir}">
<fileset file="${build.dir}/${final.name}.jar"/> <fileset file="${build.dir}/${final.name}.jar"/>
<fileset file="${build.dir}/${test.final.name}.jar"/> <fileset file="${build.dir}/${test.final.name}.jar"/>