ZOOKEEPER-963. Make Forrest work with JDK6 (Carl Steinbach via henryr)

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

CHANGES.txt

@@ -221,6 +221,8 @@ IMPROVEMENTS:
   ZOOKEEPER-921. zkPython incorrectly checks for existence of required
   ACL elements (Nicholas Knight via henryr)
 
+  ZOOKEEPER-963. Make Forrest work with	JDK6 (Carl Steinbach via henryr)
+
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.
   (Kay Kay via henry)

build.xml

@@ -360,7 +360,6 @@
       </condition>
       <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
             failonerror="true">
-        <env key="JAVA_HOME" value="${java5.home}"/>
       </exec>
       <copy todir="${docs.dir}">
         <fileset dir="${docs.src}/build/site/" />
@@ -369,14 +368,10 @@
              includes="zookeeper-default.xml" style="conf/configuration.xsl"/>
     </target>
 
-    <target name="forrest.check" unless="forrest.home" depends="java5.check">
+    <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>
 
-    <target name="java5.check" unless="java5.home">
-      <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
-    </target>
-	
     <!-- Javadoc -->
     <target name="javadoc-dev" depends="jar"
             description="Generate javadoc for zookeeper developers">

src/docs/forrest.properties

@@ -68,11 +68,13 @@
 forrest.validate=true
 forrest.validate.xdocs=${forrest.validate}
 forrest.validate.skinconf=${forrest.validate}
-forrest.validate.sitemap=${forrest.validate}
 forrest.validate.stylesheets=${forrest.validate}
 forrest.validate.skins=${forrest.validate}
 forrest.validate.skins.stylesheets=${forrest.validate.skins}
 
+# Make Forrest work with JDK6
+forrest.validate.sitemap=false
+
 # *.failonerror=(true|false) - stop when an XML file is invalid
 forrest.validate.failonerror=true