--- jsr166/build.xml	2011/05/28 00:57:34	1.85
+++ jsr166/build.xml	2011/05/28 02:32:19	1.87
@@ -149,7 +149,7 @@
     <mkdir dir="${build.javadocs.dir}"/>
 
     <javadoc destdir="${build.javadocs.dir}"
-                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}"
     >
@@ -213,31 +213,16 @@
     <delete dir="${dist.javadocs.dir}"/>
     <mkdir dir="${dist.javadocs.dir}"/>
 
-    <javadoc destdir="${dist.javadocs.dir}"
-            link="http://download.oracle.com/javase/6/docs/api/"
-            overview="${src.dir}/intro.html"
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
-            sourcepath="${src.dir}:${jdksrc.dir}"
-     >
-<!--
-      <packageset dir="${src.dir}" defaultexcludes="yes">
-      <include name="java/util/concurrent"/>
-      <include name="java/util/concurrent/atomic"/>
-      <include name="java/util/concurrent/locks"/>
-      </packageset>
--->
-      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
-      <include name="main/java/util/concurrent/*.java"/>
-      <include name="main/java/util/concurrent/atomic/*.java"/>
-      <include name="main/java/util/concurrent/locks/*.java"/>
-      <include name="main/java/util/*.java"/>
-<!--
-      <include name="main/java/util/concurrent/*.html"/>
-      <include name="main/java/util/concurrent/atomic/*.html"/>
-      <include name="main/java/util/concurrent/locks/*.html"/>
-      <include name="main/java/util/*.html"/>
--->
-<!--      <include name="jsr166x/*.java"/> -->
+    <javadoc destdir="${dist.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>
 
@@ -517,7 +502,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}" />
 
@@ -555,7 +540,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}" />
 
@@ -620,7 +605,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}" />
 
@@ -656,7 +641,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}" />
 
@@ -722,7 +707,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}" />
 
@@ -758,7 +743,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}" />