Merge branch 'master' of github.com:rzwitserloot/lombok

5 files changed, 18 insertions, 4 deletions

diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index ef12026e..d1eb92ec 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -296,10 +296,18 @@ such as converting the changelog into HTML, and creating javadoc.
 		]]></echo>
 		<javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
 			<classpath refid="build.path" />
-			<link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="./buildScripts/javadoc/java6"/>
-			<header><![CDATA[<a href='http://projectlombok.org/'>Lombok</a> - ]]>v${lombok.version}</header>
+			<link href="http://download.oracle.com/javase/6/docs/api/" />
+			<link href="http://www.slf4j.org/api/" />
+			<link href="http://commons.apache.org/logging/apidocs/" />
+			<link href="http://logging.apache.org/log4j/1.2/apidocs/" />
+			<header><![CDATA[<a href='http://projectlombok.org/' target='_blank'>Lombok</a> - ]]>v${lombok.version}</header>
 			<bottom><![CDATA[<i>Copyright &#169; 2009-2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT licence</a>.]]></bottom>
 		</javadoc>
+		<!-- bugfix for boneheaded javadoc bug where ?is-external=true is inserted before an anchor ref, breaking the anchor ref.
+		is-external=true doesn't actually do anything, so, we'll just get rid of it. -->
+		<replaceregexp match="\?is-external=true#" replace="#" flags="gi">
+			<fileset dir="build/api" includes="**/*.html" />
+		</replaceregexp>
 		<mkdir dir="doc/api" />
 		<copy todir="doc/api">
 			<fileset dir="build/api" includes="**/*.html" />
diff --git a/src/core/lombok/extern/apachecommons/Log.java b/src/core/lombok/extern/apachecommons/Log.java
index 4c82a2a7..87e7ab2c 100644
--- a/src/core/lombok/extern/apachecommons/Log.java
+++ b/src/core/lombok/extern/apachecommons/Log.java
@@ -61,6 +61,8 @@ import java.lang.annotation.Target;
  * 
  * This annotation is valid for classes and enumerations.<br />
  * 
+ * @see org.apache.commons.logging.Log org.apache.commons.logging.Log
+ * @see org.apache.commons.logging.LogFactory#getLog(java.lang.Class) org.apache.commons.logging.LogFactory.getLog(Class target)
  * @see lombok.extern.jul.Log lombok.extern.jul.Log
  * @see lombok.extern.log4j.Log lombok.extern.log4j.Log
  * @see lombok.extern.slf4j.Log lombok.extern.slf4j.Log
diff --git a/src/core/lombok/extern/jul/Log.java b/src/core/lombok/extern/jul/Log.java
index a66db671..8b2ec3af 100644
--- a/src/core/lombok/extern/jul/Log.java
+++ b/src/core/lombok/extern/jul/Log.java
@@ -60,7 +60,8 @@ import java.lang.annotation.Target;
  * </pre>
  * 
  * This annotation is valid for classes and enumerations.<br />
- * 
+ * @see java.util.logging.Logger java.util.logging.Logger
+ * @see java.util.logging.Logger#getLogger(java.lang.String) java.util.logging.Logger.getLogger(String name)
  * @see lombok.extern.apachecommons.Log lombok.extern.apachecommons.Log
  * @see lombok.extern.log4j.Log lombok.extern.log4j.Log
  * @see lombok.extern.slf4j.Log lombok.extern.slf4j.Log
diff --git a/src/core/lombok/extern/log4j/Log.java b/src/core/lombok/extern/log4j/Log.java
index 151b5e98..9d07f46d 100644
--- a/src/core/lombok/extern/log4j/Log.java
+++ b/src/core/lombok/extern/log4j/Log.java
@@ -61,6 +61,8 @@ import java.lang.annotation.Target;
  * 
  * This annotation is valid for classes and enumerations.<br />
  * 
+ * @see org.apache.log4j.Logger org.apache.log4j.Logger
+ * @see org.apache.log4j.Logger#getLogger(java.lang.Class) org.apache.log4j.Logger.getLogger(Class target)
  * @see lombok.extern.apachecommons.Log lombok.extern.apachecommons.Log
  * @see lombok.extern.jul.Log lombok.extern.jul.Log
  * @see lombok.extern.slf4j.Log lombok.extern.slf4j.Log
diff --git a/src/core/lombok/extern/slf4j/Log.java b/src/core/lombok/extern/slf4j/Log.java
index 5431847a..63307008 100644
--- a/src/core/lombok/extern/slf4j/Log.java
+++ b/src/core/lombok/extern/slf4j/Log.java
@@ -59,7 +59,8 @@ import java.lang.annotation.Target;
  * </pre>
  * 
  * This annotation is valid for classes and enumerations.<br />
- * 
+ * @see org.slf4j.Logger org.slf4j.Logger
+ * @see org.slf4j.LoggerFactory#getLogger(java.lang.Class) org.slf4j.LoggerFactory.getLogger(Class target)
  * @see lombok.extern.apachecommons.Log lombok.extern.apachecommons.Log
  * @see lombok.extern.jul.Log lombok.extern.jul.Log
  * @see lombok.extern.log4j.Log lombok.extern.log4j.Log