svn commit: r1078186 - in /hadoop/common/site: author/forrest.properties build.xml

[jghoman]

Author: jghoman
Date: Fri Mar  4 22:37:25 2011
New Revision: 1078186

URL: http://svn.apache.org/viewvc?rev=1078186&view=rev
Log:
Update forrest to work with JDK5.  Equivalent change to HADOOP-7075.

Modified:
    hadoop/common/site/author/forrest.properties
    hadoop/common/site/build.xml

Modified: hadoop/common/site/author/forrest.properties
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/author/forrest.properties?rev=1078186&r1=1078185&r2=1078186&view=diff
==============================================================================
--- hadoop/common/site/author/forrest.properties (original)
+++ hadoop/common/site/author/forrest.properties Fri Mar  4 22:37:25 2011
@@ -105,3 +105,7 @@ project.skin=hadoop-pelt
 #project.i18n=true
 project.configfile=${project.home}/src/documentation/conf/cli.xconf
 
+# Make Forrest work with Java6
+forrest.validate.sitemap=false
+forrest.validate.skins.stylesheets=false
+

Modified: hadoop/common/site/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/build.xml?rev=1078186&r1=1078185&r2=1078186&view=diff
==============================================================================
--- hadoop/common/site/build.xml (original)
+++ hadoop/common/site/build.xml Fri Mar  4 22:37:25 2011
@@ -8,7 +8,6 @@
 
   <target name="update" depends="forrest.check, clean" 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="author" executable="${forrest.home}/bin/forrest" 
failonerror="true">
-      <env key="JAVA_HOME" value="${java5.home}"/>
       <arg value="-Dforrest.validate.xdocs.failonerror=false"/>
     </exec>
     <copy todir="publish/">
@@ -16,14 +15,10 @@
     </copy>
   </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>
-
   <target name="clean">
     <delete dir="author/build"/>
   </target>