svn commit: r1175197 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt build.xml src/docs/cn/ src/fixFontsPath.sh

[sh...@apache.org]

Author: shv
Date: Sat Sep 24 16:43:48 2011
New Revision: 1175197

URL: http://svn.apache.org/viewvc?rev=1175197&view=rev
Log:
HADOOP-7457. Remove out-of-date Chinese language documentation. Contributed by Jakob Homan

Removed:
    hadoop/common/branches/branch-0.22/common/src/docs/cn/
    hadoop/common/branches/branch-0.22/common/src/fixFontsPath.sh
Modified:
    hadoop/common/branches/branch-0.22/common/CHANGES.txt
    hadoop/common/branches/branch-0.22/common/build.xml

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1175197&r1=1175196&r2=1175197&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Sat Sep 24 16:43:48 2011
@@ -541,6 +541,9 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7663. Fix TestHDFSTrash failure. (Mayank Bansal via shv)
 
+    HADOOP-7457. Remove out-of-date Chinese language documentation.
+    (Jakob Homan via eli)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/branches/branch-0.22/common/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/build.xml?rev=1175197&r1=1175196&r2=1175197&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/build.xml (original)
+++ hadoop/common/branches/branch-0.22/common/build.xml Sat Sep 24 16:43:48 2011
@@ -40,7 +40,6 @@
   <property name="lib.dir" value="${basedir}/lib"/>
   <property name="conf.dir" value="${basedir}/conf"/>
   <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"/>
 
@@ -61,7 +60,6 @@
             value="${sun.arch.data.model}"/>
   <property name="build.native" value="${build.dir}/native/${build.platform}"/>
   <property name="build.docs" value="${build.dir}/docs"/>
-  <property name="build.docs.cn" value="${build.dir}/docs/cn"/>
   <property name="build.javadoc" value="${build.docs}/api"/>
   <property name="build.javadoc.timestamp" value="${build.javadoc}/index.html" />
   <property name="build.javadoc.dev" value="${build.docs}/dev-api"/>
@@ -295,9 +293,6 @@
        <arg line="src/saveVersion.sh ${version} ${build.dir}"/>
     </exec>
 	
-   <exec executable="sh">
-       <arg line="src/fixFontsPath.sh ${src.docs.cn}"/>
-   </exec>
   </target>
 
   <import file="${test.src.dir}/aop/build/aop.xml"/>
@@ -880,7 +875,7 @@
   
   <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. 
        To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
-    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
+    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest.bat"
 	  failonerror="true">
     </exec>
     <copy todir="${build.docs}">
@@ -890,21 +885,6 @@
     <style basedir="${java.src.dir}" destdir="${build.docs}"
            includes="core-default.xml" style="conf/configuration.xsl"/>
     <antcall target="changes-to-html"/>
-    <antcall target="cn-docs"/>
-  </target>
-
-  <target name="cn-docs" depends="forrest.check, init" description="Generate forrest-based Chinese documentation. 
-        To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." 
-        if="forrest.home">
-    <exec dir="${src.docs.cn}" executable="${forrest.home}/bin/forrest" failonerror="true">
-      <env key="LANG" value="en_US.utf8"/>
-    </exec>
-    <copy todir="${build.docs.cn}">
-      <fileset dir="${src.docs.cn}/build/site/" />
-    </copy>
-    <style basedir="${java.src.dir}" destdir="${build.docs.cn}"
-           includes="core-default.xml" style="conf/configuration.xsl"/>
-    <antcall target="changes-to-html"/>
   </target>
 
   <target name="forrest.check" unless="forrest.home">
@@ -1406,7 +1386,6 @@
     <delete file="${basedir}/ivy/hadoop-common-test-pom.xml"/>
     <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
     <delete dir="${docs.src}/build"/>
-    <delete dir="${src.docs.cn}/build"/>
   </target>
 
   <target name="clean-sign" description="Clean.  Delete .asc files">