Return-Path: 
 <derby-commits-return-2266-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 23964 invoked from network); 8 Feb 2006 00:43:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 8 Feb 2006 00:43:05 -0000
Received: (qmail 60146 invoked by uid 500); 8 Feb 2006 00:43:05 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 60082 invoked by uid 500); 8 Feb 2006 00:43:04 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 60071 invoked by uid 99); 8 Feb 2006 00:43:04 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2006 16:43:04 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 07 Feb 2006 16:43:03 -0800
Received: (qmail 23918 invoked by uid 65534); 8 Feb 2006 00:42:43 -0000
Message-ID: <20060208004243.23917.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r375815 - /db/derby/code/trunk/build.xml
Date: Wed, 08 Feb 2006 00:42:43 -0000
To: derby-commits@db.apache.org
From: fuzzylogic@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fuzzylogic
Date: Tue Feb  7 16:42:41 2006
New Revision: 375815

URL: http://svn.apache.org/viewcvs?rev=375815&view=rev
Log:
DERBY-875: Use nested filesets to improve javadoc generation. This patch moves
the publishedapi javadoc set to using nested filesets.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=375815&r1=375814&r2=375815&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Feb  7 16:42:41 2006
@@ -537,45 +537,25 @@
         value="Built on ${javadoc.ts}, from revision ${changenumber}"/>
   
     <delete dir="${out.javadoc.dir}/publishedapi"/>
-    <delete dir="${out.javadoc.dir}/sourcedir"/>
     <mkdir dir="${out.javadoc.dir}/publishedapi"/>
-    <mkdir dir="${out.javadoc.dir}/sourcedir"/>
-
-    <!-- drda files -->
-    <mkdir dir="${out.javadoc.dir}/sourcedir"/>
-    <copy todir="${out.javadoc.dir}/sourcedir"> 
-      <fileset dir="${derby.drda.src.dir}"
-               includesfile="${javadoctools.dir}/publishedapi.ant"/>
-    </copy>
-
-	
-    <!-- engine files -->
-    <copy todir="${out.javadoc.dir}/sourcedir">
-      <fileset dir="${derby.engine.src.dir}"
-               includesfile="${javadoctools.dir}/publishedapi.ant"/>
-    </copy>
-
-    <!-- tools files -->
-    <copy todir="${out.javadoc.dir}/sourcedir">
-      <fileset dir="${derby.tools.src.dir}"
-               includesfile="${javadoctools.dir}/publishedapi.ant"/>
-    </copy>
-
-    <!-- client files -->
-    <copy todir="${out.javadoc.dir}/sourcedir">
-      <fileset dir="${derby.client.src.dir}"
-               includesfile="${javadoctools.dir}/publishedapi.ant"/>
-    </copy>
 
     <javadoc sourcepath="${out.javadoc.dir}/sourcedir"
              classpath="${compile.classpath};${osgi};${servlet24};${out.dir}"
              breakiterator="true"
              destdir="${out.javadoc.dir}/publishedapi"
-             packagenames="org.apache.derby.authentication,org.apache.derby.drda,org.apache.derby.jdbc.io,org.apache.derby.jdbc,org.apache.derby.tools"
              Windowtitle="Apache Derby ${major}.${minor} API Documentation"
              Doctitle="Apache Derby ${major}.${minor} API Documentation"
              Footer="${javadoc.Footer}"
-             bottom="Apache Derby ${major}.${minor} API Documentation  -  &lt;i&gt;Copyright &amp;copy; 1997,2005 The Apache Software Foundation or its licensors, as applicable.&lt;/i&gt;"/>
+             bottom="Apache Derby ${major}.${minor} API Documentation  -  &lt;i&gt;Copyright &amp;copy; 1997,2005 The Apache Software Foundation or its licensors, as applicable.&lt;/i&gt;">
+      <fileset dir="${derby.engine.src.dir}"
+               includesfile="${javadoctools.dir}/publishedapi.ant"/>
+      <fileset dir="${derby.client.src.dir}"
+               includesfile="${javadoctools.dir}/publishedapi.ant"/>
+      <fileset dir="${derby.drda.src.dir}"
+               includesfile="${javadoctools.dir}/publishedapi.ant"/>
+      <fileset dir="${derby.tools.src.dir}"
+               includesfile="${javadoctools.dir}/publishedapi.ant"/>
+    </javadoc>
 
     <delete dir="${out.javadoc.dir}/sourcedir"/>