hbase-436 website

Part 3: Edits and add current docs to website


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@620671 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -36,6 +36,7 @@
   <property name="lib.dir" value="${basedir}/lib"/>
   <property name="conf.dir" value="${basedir}/conf"/>
   <property name="docs.dir" value="${basedir}/docs"/>
+  <property name="docs.src" value="${basedir}/src/docs"/>
 
   <property name="test.output" value="no"/>
   <property name="test.timeout" value="600000"/>
@@ -186,13 +187,11 @@
     <chmod perm="ugo+x" type="file">
       <fileset dir="${dist.dir}/bin" />
     </chmod>
-    <!--Uncomment when we have a docs dir
     <mkdir dir="${dist.dir}/docs" />
     <copy todir="${dist.dir}/docs">
       <fileset dir="${docs.dir}" />
       <fileset dir="${build.docs}"/>
     </copy>
-    -->
     <copy todir="${dist.dir}">
       <fileset dir=".">
         <include name="*.txt" />
@@ -248,8 +247,22 @@
   </target>
 
   <!-- ================================================================== -->
-  <!-- Javadoc                                                            -->
+  <!-- Doc                                                                -->
   <!-- ================================================================== -->
+  <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" failonerror="true" />
+    <copy todir="${docs.dir}">
+      <fileset dir="${docs.src}/build/site/" />
+    </copy>
+    <style basedir="${conf.dir}" destdir="${docs.dir}"
+           includes="hadoop-default.xml" style="conf/configuration.xsl"/>
+  </target>
+
+  <target name="forrest.check" unless="forrest.home">
+    <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
+  </target>
+
+  <!-- Javadoc -->
   <target name="javadoc" description="Generate javadoc">
     <mkdir dir="${build.javadoc}"/>
     <javadoc

docs/index.html

@@ -39,7 +39,7 @@
     |start Project Logo
     +-->
 <div class="projectlogo">
-<a href="http://hadoop.apache.org/hbase/"><img class="logoImage" alt="HBase" src="images/hbase_logo_med.gif" title="A distributed storage system for structured data built on top of Hadoop"></a>
+<a href="http://hadoop.apache.org/hbase/"><img class="logoImage" alt="HBase" src="images/hbase_logo_med.gif" title="The Hadoop database"></a>
 </div>
 <!--+
     |end Project Logo
@@ -67,7 +67,7 @@
 <a class="unselected" href="http://wiki.apache.org/hadoop/Hbase">Wiki</a>
 </li>
 <li class="current">
-<a class="selected" href="index.html">HBase 0.1 Documentation</a>
+<a class="selected" href="index.html">HBase Documentation</a>
 </li>
 </ul>
 <!--+

docs/linkmap.html

@@ -39,7 +39,7 @@
     |start Project Logo
     +-->
 <div class="projectlogo">
-<a href="http://hadoop.apache.org/hbase/"><img class="logoImage" alt="HBase" src="images/hbase_logo_med.gif" title="A distributed storage system for structured data built on top of Hadoop"></a>
+<a href="http://hadoop.apache.org/hbase/"><img class="logoImage" alt="HBase" src="images/hbase_logo_med.gif" title="The Hadoop database"></a>
 </div>
 <!--+
     |end Project Logo
@@ -67,7 +67,7 @@
 <a class="unselected" href="http://wiki.apache.org/hadoop/Hbase">Wiki</a>
 </li>
 <li class="current">
-<a class="selected" href="index.html">HBase 0.1 Documentation</a>
+<a class="selected" href="index.html">HBase Documentation</a>
 </li>
 </ul>
 <!--+

src/docs/src/documentation/content/xdocs/tabs.xml

@@ -31,6 +31,6 @@
 
   <tab label="Project" href="http://hadoop.apache.org/hbase/" />
   <tab label="Wiki" href="http://wiki.apache.org/hadoop/Hbase" />
-  <tab label="HBase 0.1 Documentation" dir="" />  
+  <tab label="HBase Documentation" dir="" />  
   
 </tabs>

src/docs/src/documentation/skinconf.xml

@@ -30,7 +30,7 @@ which will be used to configure the chosen Forrest skin.
     In other words google will search the @domain for the query string.
 
   -->
-  <search name="Lucene" domain="hadoop.apache.org" provider="google"/>
+  <search name="HBase" domain="hadoop.apache.org" provider="google"/>
 
   <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  
@@ -65,7 +65,7 @@ which will be used to configure the chosen Forrest skin.
 
   <!-- project logo -->
   <project-name>HBase</project-name>
-  <project-description>A distributed storage system for structured data built on top of Hadoop</project-description>
+  <project-description>The Hadoop database</project-description>
   <project-url>http://hadoop.apache.org/hbase/</project-url>
   <project-logo>images/hbase_logo_med.gif</project-logo>