Author: daijy
Date: Thu Apr 22 22:51:31 2010
New Revision: 937095

URL: http://svn.apache.org/viewvc?rev=937095&view=rev
Log:
PIG-1384: Adding contrib javadoc to main Pig javadoc

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/build.xml
    hadoop/pig/trunk/src/docs/src/documentation/content/xdocs/site.xml

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=937095&r1=937094&r2=937095&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu Apr 22 22:51:31 2010
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-1384: Adding contrib javadoc to main Pig javadoc (daijy)
+
 PIG-1320: final documentation updates for Pig 0.7.0 (chandec via olgan)
 
 PIG-1363: Unnecessary loadFunc instantiations (hashutosh)

Modified: hadoop/pig/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=937095&r1=937094&r2=937095&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Thu Apr 22 22:51:31 2010
@@ -331,10 +331,34 @@
         </javadoc>
     </target>
 
+    <target name="javadoc-all" depends="jar, ivy-javadoc" description="Create 
documentation including all contrib projects">
+        <mkdir dir="${build.javadoc}" />
+        <javadoc overview="${src.dir}/overview.html" 
packagenames="org.apache.pig*,org.apache.hadoop.zebra*,org.apache.hadoop.owl*" 
destdir="${build.javadoc}" author="true" version="true" use="true" 
windowtitle="${Name} ${version} API" doctitle="${Name} ${version} API" 
bottom="Copyright &amp;copy; ${year} The Apache Software Foundation">
+            <packageset dir="${src.dir}" />
+            <packageset dir="contrib/piggybank/java/src/main/java"/>
+            <packageset dir="contrib/zebra/src/java"/>
+            <packageset dir="contrib/owl/java/main"/>
+            <link href="${javadoc.link.java}" />
+            <classpath>
+                <path refid="javadoc-classpath" />
+               <pathelement path="${output.jarfile}" />
+                <fileset dir="build">
+                    <include name="**/zebra-*-dev.jar"/>
+                </fileset>
+                <fileset dir="contrib/owl">
+                    <include name="**/owl-*-dev.jar"/>
+                </fileset>
+            </classpath>
+            <group title="pig" packages="org.apache.pig*" />
+            <group title="contrib: Piggybank" 
packages="org.apache.pig.piggybank*" />
+            <group title="contrib: Zebra" packages="org.apache.hadoop.zebra*"/>
+            <group title="contrib: Owl" packages="org.apache.hadoop.owl*"/>
+        </javadoc>
+    </target>
     <!-- ================================================================== -->
     <!-- @depricated, Documentation                                         -->
     <!-- ================================================================== -->
-    <target name="docs" depends="forrest.check, javadoc" description="Generate 
forrest-based documentation. 
+    <target name="docs" depends="forrest.check, javadoc-all" 
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.dir}" executable="${forrest.home}/bin/forrest"
           failonerror="true">
@@ -817,7 +841,7 @@
         </clover-report>
      </target>
 
-     <target name="api-xml" depends="ivy-jdiff, javadoc, write-null">
+     <target name="api-xml" depends="ivy-jdiff, javadoc-all, write-null">
         <javadoc>
                 <doclet name="jdiff.JDiff"
                         path="${jdiff.jar}:${xerces.jar}">

Modified: hadoop/pig/trunk/src/docs/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/docs/src/documentation/content/xdocs/site.xml?rev=937095&r1=937094&r2=937095&view=diff
==============================================================================
--- hadoop/pig/trunk/src/docs/src/documentation/content/xdocs/site.xml 
(original)
+++ hadoop/pig/trunk/src/docs/src/documentation/content/xdocs/site.xml Thu Apr 
22 22:51:31 2010
@@ -49,13 +49,6 @@ See http://forrest.apache.org/docs/linki
     <udf label="UDFs" href="udf.html" />
     </docs>  
     
-     <docs label="Pig Miscellaneous"> 
-     <api      label="API Docs" href="ext:api"/>
-     <wiki  label="Wiki" href="ext:wiki" />
-     <faq  label="FAQ" href="ext:faq" />
-     <relnotes  label="Release Notes"  href="ext:relnotes" />
-    </docs>
-
     <docs label="Zebra"> 
      <zover label="Zebra Overview "    href="zebra_overview.html" />
      <zusers label="Zebra Users "      href="zebra_users.html" />
@@ -64,9 +57,15 @@ See http://forrest.apache.org/docs/linki
      <zpig label="Zebra Pig "              href="zebra_pig.html" />
      <zstream label="Zebra Streaming " href="zebra_stream.html" />
      </docs>
+
+     <docs label="Miscellaneous"> 
+     <api      label="API Docs" href="api/"/>
+     <wiki  label="Wiki" href="ext:wiki" />
+     <faq  label="FAQ" href="ext:faq" />
+     <relnotes  label="Release Notes"  href="ext:relnotes" />
+    </docs>
      
  <external-refs> 
-    <api       href="http://hadoop.apache.org/pig/docs/r0.7.0/api/"; />
     <wiki      href="http://wiki.apache.org/pig/"; />
     <faq       href="http://wiki.apache.org/pig/FAQ"; />
     <relnotes href="http://hadoop.apache.org/pig/releases.html"; />


Reply via email to