Return-Path: 
 <river-commits-return-2171-apmail-incubator-river-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-river-commits-archive@minotaur.apache.org
Received: (qmail 1820 invoked from network); 1 Nov 2010 11:06:10 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 1 Nov 2010 11:06:10 -0000
Received: (qmail 45901 invoked by uid 500); 1 Nov 2010 11:06:41 -0000
Delivered-To: apmail-incubator-river-commits-archive@incubator.apache.org
Received: (qmail 45845 invoked by uid 500); 1 Nov 2010 11:06:40 -0000
Mailing-List: contact river-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:river-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:river-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:river-commits@incubator.apache.org>
List-Id: <river-commits.incubator.apache.org>
Reply-To: river-dev@incubator.apache.org
Delivered-To: mailing list river-commits@incubator.apache.org
Received: (qmail 45838 invoked by uid 99); 1 Nov 2010 11:06:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Nov 2010 11:06:38 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Nov 2010 11:06:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8BF7E238890D; Mon,  1 Nov 2010 11:05:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1029612 - /incubator/river/jtsk/trunk/build.xml
Date: Mon, 01 Nov 2010 11:05:41 -0000
To: river-commits@incubator.apache.org
From: sijskes@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101101110541.8BF7E238890D@eris.apache.org>

Author: sijskes
Date: Mon Nov  1 11:05:41 2010
New Revision: 1029612

URL: http://svn.apache.org/viewvc?rev=1029612&view=rev
Log:
refactored javadoc targets

Modified:
    incubator/river/jtsk/trunk/build.xml

Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=1029612&r1=1029611&r2=1029612&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Mon Nov  1 11:05:41 2010
@@ -47,10 +47,12 @@
     <property name="javadoc.spec.doc-title" value="${product.title} Specification-only API Documentation"/>
     <property name="javadoc.spec.win-title" value="${javadoc.spec.doc-title}"/>
 
+<!--
     <path id="javadoc.classpath">
         <path refid="river.classes"/>
         <path refid="asm.classpath"/>
     </path>
+    -->
 
     <target name="copy-resources"
 		description="Copies various resources directories to the classes dir."
@@ -222,8 +224,24 @@
         <fail if="unsupported.jdk">Building ${product.name} requires Java 2 SDK 1.4 or greater.</fail>
     </target>
 
-    <target name="doc" description="Generate javadoc documentation"
-		depends="compile">
+    <target name="doc" depends="javadoc-api" />
+
+    <target name="javadoc" depends="javadoc-api,javadoc-spec,javadoc-internals" />
+
+    <target name="-javadoc-settings">
+        <property name="javadoc.source" value="5" />
+        <sourcepath id="javadoc.sourcepath">
+            <pathelement path="${src.dir}"/>
+        </sourcepath>
+        <path id="javadoc.classpath" >
+            <fileset dir="extlibs">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+    </target>
+
+    <target name="javadoc-api" depends="-javadoc-settings"
+            description="Generate api javadoc documentation" >
         <delete dir="${doc.api.dir}" quiet="true"/>
         <mkdir  dir="${doc.api.dir}"/>
         <javadoc author="true"
@@ -233,7 +251,7 @@
 			 linkoffline="${jdk.doc.url} ${jdk.packages}"
 			 serialwarn="${verbose}"
                          verbose="${verbose}"
-			 source="5"
+			 source="${javadoc.source}"
 			 use="true"
 			 version="true"
 			 windowtitle="${javadoc.win-title}">
@@ -242,10 +260,10 @@
 			     scope="packages,types"
 			     description="Implementation Specifics:"/>
             <bottom><![CDATA[${api.copyright}]]></bottom>
-            <classpath refid="javadoc.classpath"/>
-            <sourcepath>
-                <pathelement path="${src.dir}"/>
-            </sourcepath>
+
+            <classpath refid="javadoc.classpath" />
+            <sourcepath refid="javadoc.sourcepath" />
+
             <fileset dir="${src.dir}" includes="com/sun/jini/mahalo/MahaloPermission.java"/>
             <package name="com.sun.jini.admin"/>
             <package name="com.sun.jini.config"/>
@@ -319,7 +337,7 @@
         <copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
     </target>
 
-    <target name="javadoc-internals" description="produces javadoc directory including privates">
+    <target name="javadoc-internals" depends="-javadoc-settings" description="produces javadoc directory including privates">
         <property name="doc.internals.dir" value="${doc}/internals" />
         <delete dir="${doc.internals.dir}" quiet="true"/>
         <mkdir  dir="${doc.internals.dir}"/>
@@ -331,7 +349,7 @@
 			 serialwarn="${verbose}"
                          verbose="${verbose}"
                          private="true"
-			 source="5"
+			 source="${javadoc.source}"
 			 use="true"
 			 version="true"
 			 windowtitle="${javadoc.win-title} (internals)">
@@ -340,22 +358,16 @@
 			     scope="packages,types"
 			     description="Implementation Specifics:"/>
             <bottom><![CDATA[${api.copyright}]]></bottom>
-            <classpath>
-                <fileset dir="extlibs">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-            <sourcepath>
-                <pathelement path="${src.dir}"/>
-            </sourcepath>
+            <classpath refid="javadoc.classpath" />
+            <sourcepath refid="javadoc.sourcepath" />
         </javadoc>
         <mkdir dir="${doc.internals.dir}/doc-files"/>
         <copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE"/>
     </target>
 
-    <target name="spec-doc"
+    <target name="javadoc-spec" depends="-javadoc-settings"
 		description="Generates specification-only javadoc documentation"
-		depends="compile">
+		>
         <delete dir="${doc.spec.api.dir}" quiet="true"/>
         <mkdir  dir="${doc.spec.api.dir}"/>
         <javadoc author="true"
@@ -365,7 +377,7 @@
 			 linkoffline="${jdk.doc.url} ${jdk.packages}"
 			 serialwarn="${verbose}"
                          verbose="${verbose}"
-			 source="5"
+			 source="${javadoc.source}"
 			 use="true"
 			 version="true"
 			 windowtitle="${javadoc.spec.win-title}">
@@ -373,9 +385,8 @@
 			     enabled="false"
 			     description="ignore"/>
             <classpath refid="javadoc.classpath"/>
-            <sourcepath>
-                <pathelement path="${src.dir}"/>
-            </sourcepath>
+            <sourcepath refid="javadoc.sourcepath" />
+
             <package name="net.jini.activation"/>
             <package name="net.jini.config"/>
             <package name="net.jini.constraint"/>
@@ -2090,7 +2101,7 @@
         <ant dir="qa" target="run" inheritall="false"/>
     </target>
 
-    <target name="build" depends="configentry,test,jars,doc,spec-doc"/>
+    <target name="build" depends="configentry,test,jars,doc,javadoc-spec"/>
 
     <target name="all.build" depends="build"
             description="Build all, including subcomponents">
@@ -2116,7 +2127,7 @@
         <ant dir="examples/hello" target="compile" inheritall="false" />
     </target>
 
-    <target name="all.doc" depends="jars,doc,spec-doc,javadoc-internals"
+    <target name="all.doc" depends="jars,javadoc"
             description="Generate javadoc for all, including subcomponents">
         <!-- Call qa subcomponent build -->
         <ant dir="qa" target="doc" inheritall="false" />