svn commit: r1053498 - in /zookeeper/branches/branch-3.3: CHANGES.txt build.xml src/docs/forrest.properties

[he...@apache.org]

Author: henry
Date: Wed Dec 29 01:07:37 2010
New Revision: 1053498

URL: http://svn.apache.org/viewvc?rev=1053498&view=rev
Log:
ZOOKEEPER-963. Make Forrest work with	JDK6 (Carl Steinbach via henryr)

Modified:
    zookeeper/branches/branch-3.3/CHANGES.txt
    zookeeper/branches/branch-3.3/build.xml
    zookeeper/branches/branch-3.3/src/docs/forrest.properties

Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1053498&r1=1053497&r2=1053498&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Wed Dec 29 01:07:37 2010
@@ -1,6 +1,6 @@
 Backward compatible changes:
 
-BUGFiXES:
+BUGFIXES:
   ZOOKEEPER-957. zkCleanup.sh doesn't do anything (Ted Dunning via mahadev)
 
   ZOOKEEPER-888. c-client / zkpython: Double free corruption on node
@@ -9,6 +9,9 @@ BUGFiXES:
   ZOOKEEPER-921. zkPython incorrectly checks for existence of required
   ACL elements (Nicholas Knight via henryr)
 
+IMPROVEMENTS:
+  ZOOKEEPER-963. Make Forrest work with JDK6 (Carl Steinbach via henryr)
+
 Release 3.3.2 - 2010-11-04
 Backward compatible changes:
 

Modified: zookeeper/branches/branch-3.3/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/build.xml?rev=1053498&r1=1053497&r2=1053498&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/build.xml (original)
+++ zookeeper/branches/branch-3.3/build.xml Wed Dec 29 01:07:37 2010
@@ -355,7 +355,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/" />
@@ -364,14 +363,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">

Modified: zookeeper/branches/branch-3.3/src/docs/forrest.properties
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/docs/forrest.properties?rev=1053498&r1=1053497&r2=1053498&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/docs/forrest.properties (original)
+++ zookeeper/branches/branch-3.3/src/docs/forrest.properties Wed Dec 29 01:07:37 2010
@@ -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