svn commit: r1603548 - in /db/derby/code/trunk: .gitignore build.xml

[da...@apache.org]

Author: dag
Date: Wed Jun 18 17:37:48 2014
New Revision: 1603548

URL: http://svn.apache.org/r1603548
Log:
DERBY-6552 The public api includes methods inherited from superclasses which aren't in the public api and so have no javadoc comments

Patch (derby-6552-link-fixes) to make it possible to run "ant
publishedapi" behind a firewall: one can manually download the
package-list files of Java SE 8 and J2EE 7 into to directories that
javadoc can pick up if it can't use the URLs.

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

Modified: db/derby/code/trunk/.gitignore
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/.gitignore?rev=1603548&r1=1603547&r2=1603548&view=diff
==============================================================================
--- db/derby/code/trunk/.gitignore (original)
+++ db/derby/code/trunk/.gitignore Wed Jun 18 17:37:48 2014
@@ -10,3 +10,5 @@
 /tools/ide/netbeans/nbproject/private/
 /junit_*/
 /javadoc/
+/packageListLoc-j2ee-7/
+/packageListLoc-se-8/

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1603548&r1=1603547&r2=1603548&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Jun 18 17:37:48 2014
@@ -1062,6 +1062,11 @@
 
     bootClasspath    Sensitive to JDBC level.
     extraApi         Extra files to include in the public api.
+
+    If behind a firewall, the links to Java SE and J2EE javadocs may
+    fail.  You can manually download the package-list files into the
+    folders ./packageListLoc-se-8 and ./packageListLoc-j2ee-7 instead
+    to get a correct build.
   -->
   <target name="publishedapi-workhorse" depends="initjars,set-doclint">
  
@@ -1086,7 +1091,11 @@
              Footer="${javadoc.Footer}"
              bottom="Apache Derby ${major}.${minor} API Documentation  -  &lt;i&gt;Copyright &amp;copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.&lt;/i&gt;">
       <Doctitle> Apache Derby ${major}.${minor} API Documentation</Doctitle>   
+      <link offline="true" href="http://docs.oracle.com/javase/8/docs/api/"
+                         packagelistLoc="packageListLoc-se-8" />
       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+      <link offline="true" href="http://docs.oracle.com/javaee/7/api/"
+                     packagelistLoc="packageListLoc-j2ee-7" />
       <link href="http://docs.oracle.com/javaee/7/api/"/>
       <fileset dir="${derby.engine.src.dir}"
                includesfile="${javadoc.inclusions}"/>
@@ -1098,7 +1107,6 @@
                includesfile="${javadoc.inclusions}"/>
       <fileset dir="${derby.optional.src.dir}"
                includesfile="${javadoc.inclusions}"/>
-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
       <arg value="${xarg.doclint}"/>
     </javadoc>