--- jsr166/build.xml	2011/05/28 02:19:20	1.86
+++ jsr166/build.xml	2011/05/29 16:00:20	1.88
@@ -148,14 +148,17 @@
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
 
-    <javadoc destdir="${build.javadocs.dir}"
-                link="http://download.oracle.com/javase/6/docs/api/"
-            overview="${src.dir}/intro.html"
-            sourcepath="${src.dir}:${jdksrc.dir}"
-    >
-
-      <packageset dir="${src.dir}"/>
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
+    <javadoc destdir="${build.javadocs.dir}"
+             packagenames="none"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             overview="${src.dir}/intro.html"
+             sourcepath="${src.dir}:${jdksrc.dir}" >
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+      <include name="**/*.java"/>
+      </fileset>
     </javadoc>
 
   </target>
@@ -218,7 +221,7 @@
 
     <javadoc destdir="${dist.javadocs.dir}"
              packagenames="none"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              overview="${src.dir}/intro.html"
              sourcepath="${src.dir}:${jdksrc.dir}" >
       <fileset dir="${src.dir}" defaultexcludes="yes">
@@ -502,7 +505,7 @@
 
     <javadoc destdir="${build.jsr166xjavadocs.dir}"
              packagenames="jsr166x"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />
 
@@ -540,7 +543,7 @@
 
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
              packagenames="jsr166x"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />
 
@@ -605,7 +608,7 @@
 
     <javadoc destdir="${build.jsr166yjavadocs.dir}"
              packagenames="jsr166y"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />
 
@@ -641,7 +644,7 @@
 
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
              packagenames="jsr166y"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />
 
@@ -707,7 +710,7 @@
 
     <javadoc destdir="${build.extra166yjavadocs.dir}"
              packagenames="extra166y"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />
 
@@ -743,7 +746,7 @@
 
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
              packagenames="extra166y"
-             link="http://download.oracle.com/javase/6/docs/api/"
+             link="http://download.oracle.com/javase/7/docs/api/"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}" />