From c3eddf66cfb16d5d27c7a9562ea539344bfcb2d6 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Sat, 6 Nov 2010 13:30:22 +0100
Subject: Added support for Log4J, Commons and JUL in the javac handler

---
 test/transform/resource/before/LoggerJul.java | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 test/transform/resource/before/LoggerJul.java

(limited to 'test/transform/resource/before/LoggerJul.java')

diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java
new file mode 100644
index 00000000..1e3313cb
--- /dev/null
+++ b/test/transform/resource/before/LoggerJul.java
@@ -0,0 +1,11 @@
+@lombok.jul.Log
+class LoggerJul {
+}
+
+@lombok.jul.Log(String.class)
+class LoggerJulString {
+}
+
+@lombok.jul.Log(java.lang.String.class)
+class LoggerJulJavaLangString {
+}
\ No newline at end of file
-- 
cgit 


From 8e7334a50535ef33189c3e71fcab0d9e625c6534 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Sat, 6 Nov 2010 23:29:43 +0100
Subject: Updated documentation on @Log and moved them all to lombok.extern.*

---
 buildScripts/website.ant.xml                       |  4 +-
 src/core/lombok/commons/Log.java                   | 34 ----------
 src/core/lombok/eclipse/handlers/HandleLog.java    | 32 ++++-----
 src/core/lombok/extern/apachecommons/Log.java      | 77 ++++++++++++++++++++++
 src/core/lombok/extern/jul/Log.java                | 77 ++++++++++++++++++++++
 src/core/lombok/extern/log4j/Log.java              | 77 ++++++++++++++++++++++
 src/core/lombok/extern/slf4j/Log.java              | 76 +++++++++++++++++++++
 src/core/lombok/javac/handlers/HandleLog.java      | 32 ++++-----
 src/core/lombok/jul/Log.java                       | 34 ----------
 src/core/lombok/log4j/Log.java                     | 34 ----------
 src/core/lombok/slf4j/Log.java                     | 34 ----------
 test/pretty/resource/after/Interfaces.java         |  4 +-
 .../resource/after-ecj/LoggerCommons.java          |  6 +-
 test/transform/resource/after-ecj/LoggerJul.java   |  6 +-
 test/transform/resource/after-ecj/LoggerLog4j.java |  6 +-
 test/transform/resource/after-ecj/LoggerSlf4j.java |  4 +-
 .../after-ecj/LoggerSlf4jAlreadyExists.java        |  2 +-
 .../after-ecj/LoggerSlf4jClassOfArray.java         |  2 +-
 .../resource/after-ecj/LoggerSlf4jOnNonType.java   |  2 +-
 .../resource/after-ecj/LoggerSlf4jTypes.java       | 10 +--
 .../resource/after-ecj/LoggerSlf4jWithClass.java   |  8 +--
 .../resource/after-ecj/LoggerSlf4jWithPackage.java |  4 +-
 test/transform/resource/before/LoggerCommons.java  |  6 +-
 test/transform/resource/before/LoggerJul.java      |  6 +-
 test/transform/resource/before/LoggerLog4j.java    |  6 +-
 test/transform/resource/before/LoggerSlf4j.java    |  4 +-
 .../resource/before/LoggerSlf4jAlreadyExists.java  |  2 +-
 .../resource/before/LoggerSlf4jClassOfArray.java   |  2 +-
 .../resource/before/LoggerSlf4jOnNonType.java      |  2 +-
 .../resource/before/LoggerSlf4jTypes.java          | 10 +--
 .../resource/before/LoggerSlf4jWithClass.java      |  8 +--
 .../resource/before/LoggerSlf4jWithPackage.java    |  4 +-
 usage_examples/LogExample_pre.jpage                |  2 +-
 website/features/Log.html                          | 16 ++---
 34 files changed, 402 insertions(+), 231 deletions(-)
 delete mode 100644 src/core/lombok/commons/Log.java
 create mode 100644 src/core/lombok/extern/apachecommons/Log.java
 create mode 100644 src/core/lombok/extern/jul/Log.java
 create mode 100644 src/core/lombok/extern/log4j/Log.java
 create mode 100644 src/core/lombok/extern/slf4j/Log.java
 delete mode 100644 src/core/lombok/jul/Log.java
 delete mode 100644 src/core/lombok/log4j/Log.java
 delete mode 100644 src/core/lombok/slf4j/Log.java

(limited to 'test/transform/resource/before/LoggerJul.java')

diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 6ab8d509..08fc8a55 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright © 2010 Reinier Zwitserloot and Roel Spilker.
+  Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
   
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -292,7 +292,7 @@ such as converting the changelog into HTML, and creating javadoc.
 			<classpath refid="build.path" />
 			<link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="./deps/javadoc/java6"/>
 			<header><![CDATA[<a href='http://projectlombok.org/'>Lombok</a> - ]]>v${lombok.version}</header>
-			<bottom><![CDATA[<i>Copyright &#169; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT licence</a>.]]></bottom>
+			<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>
 		<mkdir dir="doc/api" />
 		<copy todir="doc/api">
diff --git a/src/core/lombok/commons/Log.java b/src/core/lombok/commons/Log.java
deleted file mode 100644
index 974979b7..00000000
--- a/src/core/lombok/commons/Log.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.commons;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface Log {
-	
-	Class<?> value() default void.class;
-}
diff --git a/src/core/lombok/eclipse/handlers/HandleLog.java b/src/core/lombok/eclipse/handlers/HandleLog.java
index dfb45a29..ad0ad200 100644
--- a/src/core/lombok/eclipse/handlers/HandleLog.java
+++ b/src/core/lombok/eclipse/handlers/HandleLog.java
@@ -172,51 +172,51 @@ public class HandleLog {
 	}
 	
 	/**
-	 * Handles the {@link lombok.commons.Log} annotation for Eclipse.
+	 * Handles the {@link lombok.extern.apachecommons.Log} annotation for Eclipse.
 	 */
 	@ProviderFor(EclipseAnnotationHandler.class)
-	public static class HandleCommonsLog implements EclipseAnnotationHandler<lombok.commons.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.commons.Log> annotation, Annotation source, EclipseNode annotationNode) {
+	public static class HandleCommonsLog implements EclipseAnnotationHandler<lombok.extern.apachecommons.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.apachecommons.Log> annotation, Annotation source, EclipseNode annotationNode) {
 			return processAnnotation(LoggingFramework.COMMONS, annotation, source, annotationNode);
 		}
 	}
 	
 	/**
-	 * Handles the {@link lombok.jul.Log} annotation for Eclipse.
+	 * Handles the {@link lombok.extern.jul.Log} annotation for Eclipse.
 	 */
 	@ProviderFor(EclipseAnnotationHandler.class)
-	public static class HandleJulLog implements EclipseAnnotationHandler<lombok.jul.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.jul.Log> annotation, Annotation source, EclipseNode annotationNode) {
+	public static class HandleJulLog implements EclipseAnnotationHandler<lombok.extern.jul.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.jul.Log> annotation, Annotation source, EclipseNode annotationNode) {
 			return processAnnotation(LoggingFramework.JUL, annotation, source, annotationNode);
 		}
 	}
 	
 	/**
-	 * Handles the {@link lombok.log4j.Log} annotation for Eclipse.
+	 * Handles the {@link lombok.extern.log4j.Log} annotation for Eclipse.
 	 */
 	@ProviderFor(EclipseAnnotationHandler.class)
-	public static class HandleLog4jLog implements EclipseAnnotationHandler<lombok.log4j.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.log4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
+	public static class HandleLog4jLog implements EclipseAnnotationHandler<lombok.extern.log4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.log4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
 			return processAnnotation(LoggingFramework.LOG4J, annotation, source, annotationNode);
 		}
 	}
 	
 	/**
-	 * Handles the {@link lombok.slf4j.Log} annotation for Eclipse.
+	 * Handles the {@link lombok.extern.slf4j.Log} annotation for Eclipse.
 	 */
 	@ProviderFor(EclipseAnnotationHandler.class)
-	public static class HandleSlf4jLog implements EclipseAnnotationHandler<lombok.slf4j.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.slf4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
+	public static class HandleSlf4jLog implements EclipseAnnotationHandler<lombok.extern.slf4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.slf4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
 			return processAnnotation(LoggingFramework.SLF4J, annotation, source, annotationNode);
 		}
 	}
 	
 	enum LoggingFramework {
 		// private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class);
-		COMMONS(lombok.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory", "getLog"),
+		COMMONS(lombok.extern.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory", "getLog"),
 		
 		// private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(TargetType.class.getName());
-		JUL(lombok.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger", "getLogger") {
+		JUL(lombok.extern.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger", "getLogger") {
 			@Override public Expression createFactoryParameter(String typeName, Annotation source) {
 				int pS = source.sourceStart, pE = source.sourceEnd;
 				long p = (long)pS << 32 | pE;
@@ -236,10 +236,10 @@ public class HandleLog {
 		},
 		
 		// private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TargetType.class);
-		LOG4J(lombok.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger", "getLogger"),
+		LOG4J(lombok.extern.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger", "getLogger"),
 
 		// private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TargetType.class);
-		SLF4J(lombok.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory", "getLogger"),
+		SLF4J(lombok.extern.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory", "getLogger"),
 		
 		;
 		
diff --git a/src/core/lombok/extern/apachecommons/Log.java b/src/core/lombok/extern/apachecommons/Log.java
new file mode 100644
index 00000000..2afc2a6e
--- /dev/null
+++ b/src/core/lombok/extern/apachecommons/Log.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.extern.apachecommons;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Causes lombok to generate a logger field.
+ * Example:
+ * <pre>
+ * &#64;Log
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LogExample.class);
+ * }
+ * </pre>
+ * 
+ * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class.
+ * Example:
+ * <pre>
+ * &#64;Log(java.util.List.class)
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.util.List.class);
+ * }
+ * </pre>
+ * 
+ * This annotation is valid for classes and enumerations.<br />
+ * 
+ * @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
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	/**
+	 * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class here.
+	 * <br />
+	 * NB: If {@code void.class} is passed, it will be considered the same as specifying no parameter.
+	 */
+	Class<?> value() default void.class;
+}
\ No newline at end of file
diff --git a/src/core/lombok/extern/jul/Log.java b/src/core/lombok/extern/jul/Log.java
new file mode 100644
index 00000000..c2e7428e
--- /dev/null
+++ b/src/core/lombok/extern/jul/Log.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.extern.jul;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Causes lombok to generate a logger field.
+ * Example:
+ * <pre>
+ * &#64;Log
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LogExample.class.getName());
+ * }
+ * </pre>
+ * 
+ * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class.
+ * Example:
+ * <pre>
+ * &#64;Log(java.util.List.class)
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.util.List.class.getName());
+ * }
+ * </pre>
+ * 
+ * This annotation is valid for classes and enumerations.<br />
+ * 
+ * @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
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	/**
+	 * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class here.
+ 	 * <br />
+	 * NB: If {@code void.class} is passed, it will be considered the same as specifying no parameter.
+	 */
+	Class<?> value() default void.class;
+}
\ No newline at end of file
diff --git a/src/core/lombok/extern/log4j/Log.java b/src/core/lombok/extern/log4j/Log.java
new file mode 100644
index 00000000..e5fcbba0
--- /dev/null
+++ b/src/core/lombok/extern/log4j/Log.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.extern.log4j;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Causes lombok to generate a logger field.
+ * Example:
+ * <pre>
+ * &#64;Log
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LogExample.class);
+ * }
+ * </pre>
+ * 
+ * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class.
+ * Example:
+ * <pre>
+ * &#64;Log(java.util.List.class)
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.util.List.class);
+ * }
+ * </pre>
+ * 
+ * This annotation is valid for classes and enumerations.<br />
+ * 
+ * @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
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	/**
+	 * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class here.
+ 	 * <br />
+	 * NB: If {@code void.class} is passed, it will be considered the same as specifying no parameter.
+	 */
+	Class<?> value() default void.class;
+}
\ No newline at end of file
diff --git a/src/core/lombok/extern/slf4j/Log.java b/src/core/lombok/extern/slf4j/Log.java
new file mode 100644
index 00000000..306ade16
--- /dev/null
+++ b/src/core/lombok/extern/slf4j/Log.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.extern.slf4j;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+/**
+ * Causes lombok to generate a logger field.
+ * Example:
+ * <pre>
+ * &#64;Log
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LogExample.class);
+ * }
+ * </pre>
+ * 
+ * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class.
+ * Example:
+ * <pre>
+ * &#64;Log(java.util.List.class)
+ * public class LogExample {
+ * }
+ * </pre>
+ * 
+ * will generate:
+ * 
+ * <pre>
+ * public class LogExample {
+ *     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class); 
+ * }
+ * </pre>
+ * 
+ * This annotation is valid for classes and enumerations.<br />
+ * 
+ * @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
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	/**
+	 * If you do not want to use the annotated class as the logger parameter, you can specify an alternate class here.
+ 	 * <br />
+	 * NB: If {@code void.class} is passed, it will be considered the same as specifying no parameter.
+	 */
+	Class<?> value() default void.class;
+}
diff --git a/src/core/lombok/javac/handlers/HandleLog.java b/src/core/lombok/javac/handlers/HandleLog.java
index 014895a1..771f6a2b 100644
--- a/src/core/lombok/javac/handlers/HandleLog.java
+++ b/src/core/lombok/javac/handlers/HandleLog.java
@@ -112,51 +112,51 @@ public class HandleLog {
 	}
 	
 	/**
-	 * Handles the {@link lombok.commons.Log} annotation for javac.
+	 * Handles the {@link lombok.extern.apachecommons.Log} annotation for javac.
 	 */
 	@ProviderFor(JavacAnnotationHandler.class)
-	public static class HandleCommonsLog implements JavacAnnotationHandler<lombok.commons.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.commons.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+	public static class HandleCommonsLog implements JavacAnnotationHandler<lombok.extern.apachecommons.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.apachecommons.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
 			return processAnnotation(LoggingFramework.COMMONS, annotation, annotationNode);
 		}
 	}
 	
 	/**
-	 * Handles the {@link lombok.jul.Log} annotation for javac.
+	 * Handles the {@link lombok.extern.jul.Log} annotation for javac.
 	 */
 	@ProviderFor(JavacAnnotationHandler.class)
-	public static class HandleJulLog implements JavacAnnotationHandler<lombok.jul.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.jul.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+	public static class HandleJulLog implements JavacAnnotationHandler<lombok.extern.jul.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.jul.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
 			return processAnnotation(LoggingFramework.JUL, annotation, annotationNode);
 		}
 	}	
 	
 	/**
-	 * Handles the {@link lombok.log4j.Log} annotation for javac.
+	 * Handles the {@link lombok.extern.log4j.Log} annotation for javac.
 	 */
 	@ProviderFor(JavacAnnotationHandler.class)
-	public static class HandleLog4jLog implements JavacAnnotationHandler<lombok.log4j.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.log4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+	public static class HandleLog4jLog implements JavacAnnotationHandler<lombok.extern.log4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.log4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
 			return processAnnotation(LoggingFramework.LOG4J, annotation, annotationNode);
 		}
 	}
 	
 	/**
-	 * Handles the {@link lombok.slf4j.Log} annotation for javac.
+	 * Handles the {@link lombok.extern.slf4j.Log} annotation for javac.
 	 */
 	@ProviderFor(JavacAnnotationHandler.class)
-	public static class HandleSlf4jLog implements JavacAnnotationHandler<lombok.slf4j.Log> {
-		@Override public boolean handle(AnnotationValues<lombok.slf4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+	public static class HandleSlf4jLog implements JavacAnnotationHandler<lombok.extern.slf4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.extern.slf4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
 			return processAnnotation(LoggingFramework.SLF4J, annotation, annotationNode);
 		}
 	}
 	
 	enum LoggingFramework {
 		// private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class);
-		COMMONS(lombok.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory.getLog"),
+		COMMONS(lombok.extern.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory.getLog"),
 		
 		// private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(TargetType.class.getName());
-		JUL(lombok.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger.getLogger") {
+		JUL(lombok.extern.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger.getLogger") {
 			@Override public JCExpression createFactoryParameter(JavacNode typeNode, String typeName) {
 				TreeMaker maker = typeNode.getTreeMaker();
 				JCExpression classAccess = super.createFactoryParameter(typeNode, typeName);
@@ -166,10 +166,10 @@ public class HandleLog {
 		},
 		
 		// private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TargetType.class);
-		LOG4J(lombok.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger.getLogger"),
+		LOG4J(lombok.extern.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger.getLogger"),
 		
 		// private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TargetType.class);
-		SLF4J(lombok.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory.getLogger"),
+		SLF4J(lombok.extern.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory.getLogger"),
 		
 		;
 		
diff --git a/src/core/lombok/jul/Log.java b/src/core/lombok/jul/Log.java
deleted file mode 100644
index 5d41d1df..00000000
--- a/src/core/lombok/jul/Log.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.jul;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface Log {
-	
-	Class<?> value() default void.class;
-}
diff --git a/src/core/lombok/log4j/Log.java b/src/core/lombok/log4j/Log.java
deleted file mode 100644
index 6a0e6b0a..00000000
--- a/src/core/lombok/log4j/Log.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.log4j;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface Log {
-	
-	Class<?> value() default void.class;
-}
diff --git a/src/core/lombok/slf4j/Log.java b/src/core/lombok/slf4j/Log.java
deleted file mode 100644
index 4a82e239..00000000
--- a/src/core/lombok/slf4j/Log.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.slf4j;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface Log {
-	
-	Class<?> value() default void.class;
-}
diff --git a/test/pretty/resource/after/Interfaces.java b/test/pretty/resource/after/Interfaces.java
index c8a5cca4..c5008f2b 100644
--- a/test/pretty/resource/after/Interfaces.java
+++ b/test/pretty/resource/after/Interfaces.java
@@ -2,6 +2,6 @@
 interface Interfaces {
 	int x = 10;
 	void y();
-	public static final int a = 20;
-	public abstract void b();
+	int a = 20;
+	void b();
 }
diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java
index e5a3bf35..bb38983f 100644
--- a/test/transform/resource/after-ecj/LoggerCommons.java
+++ b/test/transform/resource/after-ecj/LoggerCommons.java
@@ -1,4 +1,4 @@
-@lombok.commons.Log class LoggerCommons {
+@lombok.extern.apachecommons.Log class LoggerCommons {
   private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
   <clinit>() {
   }
@@ -6,7 +6,7 @@
     super();
   }
 }
-@lombok.commons.Log(String.class) class LoggerCommonsString {
+@lombok.extern.apachecommons.Log(String.class) class LoggerCommonsString {
   private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class);
   <clinit>() {
   }
@@ -14,7 +14,7 @@
     super();
   }
 }
-@lombok.commons.Log(java.lang.String.class) class LoggerCommonsJavaLangString {
+@lombok.extern.apachecommons.Log(java.lang.String.class) class LoggerCommonsJavaLangString {
   private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class);
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java
index 99c1000c..3d09cb71 100644
--- a/test/transform/resource/after-ecj/LoggerJul.java
+++ b/test/transform/resource/after-ecj/LoggerJul.java
@@ -1,4 +1,4 @@
-@lombok.jul.Log class LoggerJul {
+@lombok.extern.jul.Log class LoggerJul {
   private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
   <clinit>() {
   }
@@ -6,7 +6,7 @@
     super();
   }
 }
-@lombok.jul.Log(String.class) class LoggerJulString {
+@lombok.extern.jul.Log(String.class) class LoggerJulString {
   private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName());
   <clinit>() {
   }
@@ -14,7 +14,7 @@
     super();
   }
 }
-@lombok.jul.Log(java.lang.String.class) class LoggerJulJavaLangString {
+@lombok.extern.jul.Log(java.lang.String.class) class LoggerJulJavaLangString {
   private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName());
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java
index 64445b96..45898a57 100644
--- a/test/transform/resource/after-ecj/LoggerLog4j.java
+++ b/test/transform/resource/after-ecj/LoggerLog4j.java
@@ -1,4 +1,4 @@
-@lombok.log4j.Log class LoggerLog4j {
+@lombok.extern.log4j.Log class LoggerLog4j {
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
   <clinit>() {
   }
@@ -6,7 +6,7 @@
     super();
   }
 }
-@lombok.log4j.Log(String.class) class LoggerLog4jString {
+@lombok.extern.log4j.Log(String.class) class LoggerLog4jString {
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class);
   <clinit>() {
   }
@@ -14,7 +14,7 @@
     super();
   }
 }
-@lombok.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString {
+@lombok.extern.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString {
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class);
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java
index 2e4d65a5..24682e97 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4j.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4j.java
@@ -1,4 +1,4 @@
-@lombok.slf4j.Log class LoggerSlf4j {
+@lombok.extern.slf4j.Log class LoggerSlf4j {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
   <clinit>() {
   }
@@ -7,7 +7,7 @@
   }
 }
 class LoggerSlf4jOuter {
-  static @lombok.slf4j.Log class Inner {
+  static @lombok.extern.slf4j.Log class Inner {
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
     <clinit>() {
     }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java
index 60e83922..22fa0eeb 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java
@@ -1,4 +1,4 @@
-@lombok.slf4j.Log class LoggerSlf4jAlreadyExists {
+@lombok.extern.slf4j.Log class LoggerSlf4jAlreadyExists {
   int log;
   LoggerSlf4jAlreadyExists() {
     super();
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
index ffec7e66..a3dad07b 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
@@ -1,4 +1,4 @@
-@lombok.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray {
+@lombok.extern.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java
index 83567493..a45612ae 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java
@@ -2,6 +2,6 @@ class LoggerSlf4jOnNonType {
   LoggerSlf4jOnNonType() {
     super();
   }
-  @lombok.slf4j.Log void foo() {
+  @lombok.extern.slf4j.Log void foo() {
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
index 2e860ed2..74214cc4 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
@@ -1,8 +1,8 @@
-@lombok.slf4j.Log interface LoggerSlf4jTypesInterface {
+@lombok.extern.slf4j.Log interface LoggerSlf4jTypesInterface {
 }
-@lombok.slf4j.Log @interface LoggerSlf4jTypesAnnotation {
+@lombok.extern.slf4j.Log @interface LoggerSlf4jTypesAnnotation {
 }
-@lombok.slf4j.Log enum LoggerSlf4jTypesEnum {
+@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnum {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
   <clinit>() {
   }
@@ -10,7 +10,7 @@
     super();
   }
 }
-@lombok.slf4j.Log enum LoggerSlf4jTypesEnumWithElement {
+@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnumWithElement {
   FOO(),
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
   <clinit>() {
@@ -20,7 +20,7 @@
   }
 }
 interface LoggerSlf4jTypesInterfaceOuter {
-  @lombok.slf4j.Log class Inner {
+  @lombok.extern.slf4j.Log class Inner {
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
     <clinit>() {
     }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
index fbb4b2d2..920f84e4 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
@@ -1,4 +1,4 @@
-@lombok.slf4j.Log(String.class) class LoggerSlf4jWithClass {
+@lombok.extern.slf4j.Log(String.class) class LoggerSlf4jWithClass {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class);
   <clinit>() {
   }
@@ -6,7 +6,7 @@
     super();
   }
 }
-@lombok.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList {
+@lombok.extern.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class);
   <clinit>() {
   }
@@ -14,7 +14,7 @@
     super();
   }
 }
-@lombok.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue {
+@lombok.extern.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
   <clinit>() {
   }
@@ -22,7 +22,7 @@
     super();
   }
 }
-@lombok.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid {
+@lombok.extern.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
index 76d19bc3..d56db764 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
@@ -1,5 +1,5 @@
 package before;
-@lombok.slf4j.Log class LoggerSlf4jWithPackage {
+@lombok.extern.slf4j.Log class LoggerSlf4jWithPackage {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
   <clinit>() {
   }
@@ -8,7 +8,7 @@ package before;
   }
 }
 class LoggerSlf4jWithPackageOuter {
-  static @lombok.slf4j.Log class Inner {
+  static @lombok.extern.slf4j.Log class Inner {
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
     <clinit>() {
     }
diff --git a/test/transform/resource/before/LoggerCommons.java b/test/transform/resource/before/LoggerCommons.java
index 97c91ef0..d6359bd7 100644
--- a/test/transform/resource/before/LoggerCommons.java
+++ b/test/transform/resource/before/LoggerCommons.java
@@ -1,11 +1,11 @@
-@lombok.commons.Log
+@lombok.extern.apachecommons.Log
 class LoggerCommons {
 }
 
-@lombok.commons.Log(String.class)
+@lombok.extern.apachecommons.Log(String.class)
 class LoggerCommonsString {
 }
 
-@lombok.commons.Log(java.lang.String.class)
+@lombok.extern.apachecommons.Log(java.lang.String.class)
 class LoggerCommonsJavaLangString {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java
index 1e3313cb..1c74ea4f 100644
--- a/test/transform/resource/before/LoggerJul.java
+++ b/test/transform/resource/before/LoggerJul.java
@@ -1,11 +1,11 @@
-@lombok.jul.Log
+@lombok.extern.jul.Log
 class LoggerJul {
 }
 
-@lombok.jul.Log(String.class)
+@lombok.extern.jul.Log(String.class)
 class LoggerJulString {
 }
 
-@lombok.jul.Log(java.lang.String.class)
+@lombok.extern.jul.Log(java.lang.String.class)
 class LoggerJulJavaLangString {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerLog4j.java b/test/transform/resource/before/LoggerLog4j.java
index 33a876c9..0199809c 100644
--- a/test/transform/resource/before/LoggerLog4j.java
+++ b/test/transform/resource/before/LoggerLog4j.java
@@ -1,11 +1,11 @@
-@lombok.log4j.Log
+@lombok.extern.log4j.Log
 class LoggerLog4j {
 }
 
-@lombok.log4j.Log(String.class)
+@lombok.extern.log4j.Log(String.class)
 class LoggerLog4jString {
 }
 
-@lombok.log4j.Log(java.lang.String.class)
+@lombok.extern.log4j.Log(java.lang.String.class)
 class LoggerLog4jJavaLangString {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4j.java b/test/transform/resource/before/LoggerSlf4j.java
index 78a33fe4..92aeefbd 100644
--- a/test/transform/resource/before/LoggerSlf4j.java
+++ b/test/transform/resource/before/LoggerSlf4j.java
@@ -1,8 +1,8 @@
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 class LoggerSlf4j {
 }
 class LoggerSlf4jOuter {
-	@lombok.slf4j.Log
+	@lombok.extern.slf4j.Log
 	static class Inner {
 		
 	}
diff --git a/test/transform/resource/before/LoggerSlf4jAlreadyExists.java b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java
index d0b26482..8ac0225d 100644
--- a/test/transform/resource/before/LoggerSlf4jAlreadyExists.java
+++ b/test/transform/resource/before/LoggerSlf4jAlreadyExists.java
@@ -1,4 +1,4 @@
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 class LoggerSlf4jAlreadyExists {
 	int log;
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4jClassOfArray.java b/test/transform/resource/before/LoggerSlf4jClassOfArray.java
index 34394f13..f18e11f0 100644
--- a/test/transform/resource/before/LoggerSlf4jClassOfArray.java
+++ b/test/transform/resource/before/LoggerSlf4jClassOfArray.java
@@ -1,3 +1,3 @@
-@lombok.slf4j.Log(String[].class)
+@lombok.extern.slf4j.Log(String[].class)
 class LoggerSlf4jClassOfArray {
 }
diff --git a/test/transform/resource/before/LoggerSlf4jOnNonType.java b/test/transform/resource/before/LoggerSlf4jOnNonType.java
index 06c8b059..c57e171c 100644
--- a/test/transform/resource/before/LoggerSlf4jOnNonType.java
+++ b/test/transform/resource/before/LoggerSlf4jOnNonType.java
@@ -1,5 +1,5 @@
 class LoggerSlf4jOnNonType {
-	@lombok.slf4j.Log
+	@lombok.extern.slf4j.Log
 	void foo() {
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4jTypes.java b/test/transform/resource/before/LoggerSlf4jTypes.java
index 27201090..9f221f73 100644
--- a/test/transform/resource/before/LoggerSlf4jTypes.java
+++ b/test/transform/resource/before/LoggerSlf4jTypes.java
@@ -1,18 +1,18 @@
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 interface LoggerSlf4jTypesInterface {
 }
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 @interface LoggerSlf4jTypesAnnotation {
 }
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 enum LoggerSlf4jTypesEnum {
 }
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 enum LoggerSlf4jTypesEnumWithElement {
 	FOO;
 }
 interface LoggerSlf4jTypesInterfaceOuter {
-	@lombok.slf4j.Log
+	@lombok.extern.slf4j.Log
 	class Inner {
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4jWithClass.java b/test/transform/resource/before/LoggerSlf4jWithClass.java
index 0005d1f5..b9cf8187 100644
--- a/test/transform/resource/before/LoggerSlf4jWithClass.java
+++ b/test/transform/resource/before/LoggerSlf4jWithClass.java
@@ -1,12 +1,12 @@
-@lombok.slf4j.Log(String.class)
+@lombok.extern.slf4j.Log(String.class)
 class LoggerSlf4jWithClass {
 }
-@lombok.slf4j.Log(java.util.List.class)
+@lombok.extern.slf4j.Log(java.util.List.class)
 class LoggerSlf4jWithClassList {
 }
-@lombok.slf4j.Log(value = java.lang.String.class)
+@lombok.extern.slf4j.Log(value = java.lang.String.class)
 class LoggerSlf4jWithClassValue {
 }
-@lombok.slf4j.Log(void.class)
+@lombok.extern.slf4j.Log(void.class)
 class LoggerSlf4jWithClassVoid {
 }
diff --git a/test/transform/resource/before/LoggerSlf4jWithPackage.java b/test/transform/resource/before/LoggerSlf4jWithPackage.java
index db6e8939..efbaef68 100644
--- a/test/transform/resource/before/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/before/LoggerSlf4jWithPackage.java
@@ -1,9 +1,9 @@
 package before;
-@lombok.slf4j.Log
+@lombok.extern.slf4j.Log
 class LoggerSlf4jWithPackage {
 }
 class LoggerSlf4jWithPackageOuter {
-	@lombok.slf4j.Log
+	@lombok.extern.slf4j.Log
 	static class Inner {
 	}
 }
\ No newline at end of file
diff --git a/usage_examples/LogExample_pre.jpage b/usage_examples/LogExample_pre.jpage
index 450a6a34..7ab64cd4 100644
--- a/usage_examples/LogExample_pre.jpage
+++ b/usage_examples/LogExample_pre.jpage
@@ -1,4 +1,4 @@
-import lombok.slf4j.Log;
+import lombok.extern.slf4j.Log;
 
 @Log
 public class LogExample {
diff --git a/website/features/Log.html b/website/features/Log.html
index 45beca77..c63eeb05 100644
--- a/website/features/Log.html
+++ b/website/features/Log.html
@@ -20,14 +20,14 @@
 			</p><p>
 			There are four <code>@Log</code> choices available:<br />
 			<dl>
-				<dt><code>@lombok.commons.Log</code></dt>
-				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/Log.html">org.apache.commons.logging.Log</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/LogFactory.html#getLog(java.lang.Class)">org.apache.commons.logging.LogFactory.getLog</a>(TargetType.<span class="keyword">class</span>);</code></dd>
-				<dt><code>@lombok.jul.Log</code></dt>
-				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html">java.util.logging.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html#getLogger(java.lang.String)">java.util.logging.Logger.getLogger</a>(TargetType.<span class="keyword">class</span>.getName());</code></dd>
-				<dt><code>@lombok.log4j.Log</code></dt>
-				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html">org.apache.log4j.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html#getLogger(java.lang.Class)">org.apache.log4j.Logger.getLogger</a>(TargetType.<span class="keyword">class</span>);</code></dd>
-				<dt><code>@lombok.slf4j.Log</code></dt>
-				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://www.slf4j.org/api/org/slf4j/Logger.html">org.slf4j.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://www.slf4j.org/apidocs/org/slf4j/LoggerFactory.html#getLogger(java.lang.Class)">org.slf4j.LoggerFactory.getLogger</a>(TargetType.<span class="keyword">class</span>);</code></dd>
+				<dt><code>@lombok.extern.apachecommons.Log</code></dt>
+				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/Log.html">org.apache.commons.logging.Log</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://commons.apache.org/logging/apidocs/org/apache/commons/logging/LogFactory.html#getLog(java.lang.Class)">org.apache.commons.logging.LogFactory.getLog</a>(LogExample.<span class="keyword">class</span>);</code></dd>
+				<dt><code>@lombok.extern.jul.Log</code></dt>
+				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html">java.util.logging.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/Logger.html#getLogger(java.lang.String)">java.util.logging.Logger.getLogger</a>(LogExample.<span class="keyword">class</span>.getName());</code></dd>
+				<dt><code>@lombok.extern.log4j.Log</code></dt>
+				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html">org.apache.log4j.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Logger.html#getLogger(java.lang.Class)">org.apache.log4j.Logger.getLogger</a>(LogExample.<span class="keyword">class</span>);</code></dd>
+				<dt><code>@lombok.extern.slf4j.Log</code></dt>
+				<dd>Creates <code><span class="keyword">private&nbsp;static&nbsp;final&nbsp;</span><a href="http://www.slf4j.org/api/org/slf4j/Logger.html">org.slf4j.Logger</a>&nbsp;<span class="staticfield">log</span>&nbsp;=&nbsp;<a href="http://www.slf4j.org/apidocs/org/slf4j/LoggerFactory.html#getLogger(java.lang.Class)">org.slf4j.LoggerFactory.getLogger</a>(LogExample.<span class="keyword">class</span>);</code></dd>
 			</dl>
 			</p>
 			<p>
-- 
cgit