From 94d5c540870f58e4b52c297358a9a6a5605413a0 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 26 Jun 2009 19:52:25 +0000
Subject: [PATCH] HBASE-1437 broken links in hbase.org

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@788839 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                             |  1 +
 build.xml                               | 11 ++++-------
 src/docs/src/documentation/skinconf.xml |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6a0aff6bebb..d4de5ac3530 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -232,6 +232,7 @@ Release 0.20.0 - Unreleased
    HBASE-1560  TIF can't seem to find one region
    HBASE-1580  Store scanner does not consult filter.filterRow at end of scan
                (Clint Morgan via Stack)
+   HBASE-1437  broken links in hbase.org
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
diff --git a/build.xml b/build.xml
index a74c8ff5da0..74253ce6d1f 100644
--- a/build.xml
+++ b/build.xml
@@ -162,10 +162,8 @@
         <include name="**/*.properties" />
       </fileset>
     </copy>
-    <jar jarfile="${jarfile}"
-        basedir="${build.classes}" >
-      <fileset file="${basedir}/conf/hbase-default.xml"/>
-      <fileset file="${basedir}/conf/zoo.cfg"/>
+    <jar jarfile="${jarfile}" basedir="${build.classes}" >
+      <zipfileset dir="conf" prefix="conf" includes="zoo.cfg,hbase-default.xml" />
       <zipfileset dir="${build.webapps}" prefix="webapps"/>
    		<manifest>
             <attribute name="Main-Class" value="org/apache/hadoop/hbase/mapred/Driver" />
@@ -282,7 +280,6 @@
     </chmod>
     <mkdir dir="${dist.dir}/docs" />
     <copy todir="${dist.dir}/docs">
-      <fileset dir="${docs.dir}" />
       <fileset dir="${build.docs}"/>
     </copy>
     <copy todir="${dist.dir}">
@@ -347,10 +344,10 @@
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" failonerror="true" >
       <env key="JAVA_HOME" value="${java5.home}"/>
     </exec>
-    <copy todir="${docs.dir}">
+    <copy todir="${build.docs}">
       <fileset dir="${docs.src}/build/site/" />
     </copy>
-    <style basedir="${conf.dir}" destdir="${docs.dir}"
+    <style basedir="${conf.dir}" destdir="${build.docs}"
            includes="hadoop-default.xml" style="conf/configuration.xsl"/>
   </target>
 
diff --git a/src/docs/src/documentation/skinconf.xml b/src/docs/src/documentation/skinconf.xml
index b31ed3355c9..04a8ce8ba10 100644
--- a/src/docs/src/documentation/skinconf.xml
+++ b/src/docs/src/documentation/skinconf.xml
@@ -84,7 +84,7 @@ which will be used to configure the chosen Forrest skin.
   <favicon-url>images/favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2008</year>
+  <year>2009</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>