You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2010/08/11 03:03:16 UTC
svn commit: r984277 - in /db/derby/code/branches/10.3: build.xml
tools/javadoc/jdbc4list
Author: myrnavl
Date: Wed Aug 11 01:03:16 2010
New Revision: 984277
URL: http://svn.apache.org/viewvc?rev=984277&view=rev
Log:
DERBY-4761; javadoc warnings for 10.3 with jdk 1.6 set
Added:
db/derby/code/branches/10.3/tools/javadoc/jdbc4list (with props)
Modified:
db/derby/code/branches/10.3/build.xml
Modified: db/derby/code/branches/10.3/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/build.xml?rev=984277&r1=984276&r2=984277&view=diff
==============================================================================
--- db/derby/code/branches/10.3/build.xml (original)
+++ db/derby/code/branches/10.3/build.xml Wed Aug 11 01:03:16 2010
@@ -805,10 +805,51 @@
<link href="."/>
</javadoc>
+ <antcall target="dojavadoc16"/>
+
<delete dir="${javadoc.temp.dir}"/>
</target>
+ <target name="dojavadoc16" if="jdk16">
+ <javadoc
+ executable="${javadoc.tool}"
+ additionalparam="-J-mx320M"
+ packagenames="org.*"
+ access="private"
+ breakiterator="yes"
+ useexternalfile="yes"
+ classpath="${out.dir};${java14compile.classpath};${jars.extras};${osgi}"
+ destdir="${out.javadoc.dir}/engine"
+ windowtitle="Apache Derby V${major}.${minor} Internals"
+ doctitle="Apache Derby V${major}.${minor} Internals"
+ Footer="${javadoc.Footer}"
+ bottom="Apache Derby V${major}.${minor} Internals - <i>Copyright &copy; 2004,2008 The Apache Software Foundation. All Rights Reserved.</i>"
+ source="1.5">
+ <taglet name="org.apache.derbyBuild.javadoc.FormatIdTaglet"
+ path="${basedir}/classes"/>
+ <taglet name="org.apache.derbyBuild.javadoc.PurposeTaglet"
+ path="${basedir}/classes"/>
+ <taglet name="org.apache.derbyBuild.javadoc.UpgradeTaglet"
+ path="${basedir}/classes"/>
+ <taglet name="org.apache.derbyBuild.javadoc.DiskLayoutTaglet"
+ path="${basedir}/classes"/>
+ <taglet name="org.apache.derbyBuild.javadoc.EndFormatTaglet"
+ path="${basedir}/classes"/>
+ <fileset dir="${derby.engine.src.dir}"
+ includes="**/*40.java,org/apache/derby/impl/services/locks/ConcurrentLockSet.java"
+ />
+ <fileset dir="${derby.client.src.dir}"
+ includes="**/*40.java"
+ />
+ <fileset dir="${derby.engine.src.dir}"
+ excludesfile="${javadoc.exclusions}"/>
+ <fileset dir="${derby.client.src.dir}"
+ excludesfile="${javadoc.exclusions}"/>
+ <link href="."/>
+ </javadoc>
+ </target>
+
<!--
Optionally include extra JDBC4 support in public API.
-->
@@ -863,6 +904,9 @@
<filelist dir="${javadoctools.dir}"
files="${more_exclusions}"
/>
+ <filelist dir="${javadoctools.dir}"
+ files="jdbc4list"
+ />
</concat>
</target>
Added: db/derby/code/branches/10.3/tools/javadoc/jdbc4list
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/tools/javadoc/jdbc4list?rev=984277&view=auto
==============================================================================
--- db/derby/code/branches/10.3/tools/javadoc/jdbc4list (added)
+++ db/derby/code/branches/10.3/tools/javadoc/jdbc4list Wed Aug 11 01:03:16 2010
@@ -0,0 +1,22 @@
+# This file contains the extra list of the files to be included
+# with Derby's public JDBC4 api but not with the public JDBC3 api.
+# This list supplements the common list found in
+# publishedapi.ant.
+#
+# IMPORTANT: all names should be like package names, but with slashes
+# instead of dots.
+#
+# Add new files to the appropriate package section; add new sections
+# for new packages.
+#
+# IMPORTANT: if you are adding a new package, be sure to add it to
+# the list of packages in the publishedapi target in
+# the toplevel build.xml file.
+#
+# Please do not add whitespace in front of class names.
+# Blank lines and comments are allowed.
+
+# package: org.apache.derby
+
+**/*40.java
+org/apache/derby/impl/services/locks/ConcurrentLockSet.java
Propchange: db/derby/code/branches/10.3/tools/javadoc/jdbc4list
------------------------------------------------------------------------------
svn:eol-style = native