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 co...@apache.org on 2011/02/15 20:30:13 UTC
svn commit: r1071021 - in /hadoop/common/trunk: CHANGES.txt build.xml

Author: cos
Date: Tue Feb 15 19:30:12 2011
New Revision: 1071021

URL: http://svn.apache.org/viewvc?rev=1071021&view=rev
Log:
HADOOP-7094. hadoop.css got lost during project split. Contributed by Konstantin Boudnik.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/build.xml

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1071021&r1=1071020&r2=1071021&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Feb 15 19:30:12 2011
@@ -491,6 +491,8 @@ Release 0.22.0 - Unreleased
 
     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
 
   IMPROVEMENTS

Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1071021&r1=1071020&r2=1071021&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Tue Feb 15 19:30:12 2011
@@ -43,6 +43,7 @@
   <property name="docs.src" value="${basedir}/src/docs"/>
   <property name="src.docs.cn" value="${basedir}/src/docs/cn"/>
   <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.classes" value="${build.dir}/classes"/>
@@ -274,6 +275,12 @@
     </touch>
     <delete file="${touch.temp.file}"/>
     <!-- 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">
       <fileset dir="${conf.dir}" includes="**/*.template"/>
@@ -1118,6 +1125,10 @@
       <fileset file="${contrib.dir}/build.xml"/>
     </subant>  	
 
+    <copy todir="${dist.dir}/webapps">
+      <fileset dir="${build.webapps}"/>
+    </copy>
+
     <copy todir="${dist.dir}"> 
       <fileset file="${build.dir}/${final.name}.jar"/>
       <fileset file="${build.dir}/${test.final.name}.jar"/>