svn commit: r1214655 - in /hadoop/common/branches/branch-1.0: CHANGES.txt build.xml src/docs/src/documentation/content/xdocs/tabs.xml

[ma...@apache.org]

Author: mattf
Date: Thu Dec 15 08:34:36 2011
New Revision: 1214655

URL: http://svn.apache.org/viewvc?rev=1214655&view=rev
Log:
HADOOP-7923. Update doc versions from 0.20 to 1.0, and automate the updating of version numbers in the doc system. Contributed by Nicholas Sze.

Modified:
    hadoop/common/branches/branch-1.0/CHANGES.txt
    hadoop/common/branches/branch-1.0/build.xml
    hadoop/common/branches/branch-1.0/src/docs/src/documentation/content/xdocs/tabs.xml

Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1214655&r1=1214654&r2=1214655&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Dec 15 08:34:36 2011
@@ -56,6 +56,9 @@ Release 1.0.0 - 2011.11.27
     HDFS-2604. Add a log message to show if WebHDFS is enabled and a
     configuration section in the forrest doc.  (szetszwo)
 
+    HADOOP-7923. Update doc versions from 0.20 to 1.0, and automate the
+    updating of version numbers in the doc system.  (szetszwo via mattf)
+
   BUG FIXES
 
     HADOOP-7869. HADOOP_HOME warning happens all of the time (Owen O'Malley

Modified: hadoop/common/branches/branch-1.0/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/build.xml?rev=1214655&r1=1214654&r2=1214655&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/build.xml (original)
+++ hadoop/common/branches/branch-1.0/build.xml Thu Dec 15 08:34:36 2011
@@ -1228,6 +1228,9 @@
   <!-- ================================================================== -->
   
   <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">
+    <echo file="${build.dir}/hadoop.ent" append="false">
+      &lt;!ENTITY HadoopVersion "${version}"&gt; 
+    </echo>
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
 	  failonerror="true">
       <env key="JAVA_HOME" value="${java5.home}"/>
@@ -1243,7 +1246,6 @@
     <style basedir="${mapred.src.dir}" destdir="${build.docs}"
            includes="mapred-default.xml" style="conf/configuration.xsl"/>
     <antcall target="changes-to-html"/>
-    <antcall target="cn-docs"/>
   </target>
 
   <target name="cn-docs" depends="forrest.check, init" 

Modified: hadoop/common/branches/branch-1.0/src/docs/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/docs/src/documentation/content/xdocs/tabs.xml?rev=1214655&r1=1214654&r2=1214655&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/docs/src/documentation/content/xdocs/tabs.xml (original)
+++ hadoop/common/branches/branch-1.0/src/docs/src/documentation/content/xdocs/tabs.xml Thu Dec 15 08:34:36 2011
@@ -15,8 +15,12 @@
   limitations under the License.
 -->
 
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" 
-          "http://forrest.apache.org/dtd/tab-cocoon-v10.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
+  "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd" [
+    <!ENTITY % hadoop-entities PUBLIC "-//Apache//ENTITIES Hadoop//EN"
+    "../../../../../../build/hadoop.ent">
+    %hadoop-entities;
+]>
 
 <tabs software="Hadoop"
       title="Hadoop"
@@ -31,6 +35,6 @@
 
   <tab label="Project" href="http://hadoop.apache.org/core/" />
   <tab label="Wiki" href="http://wiki.apache.org/hadoop" />
-  <tab label="Hadoop 0.20 Documentation" dir="" />  
+  <tab label="Hadoop &HadoopVersion; Documentation" dir="" />
   
 </tabs>