[configuration] Merge branch 'master' as we work on configuration.

* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.

Conflicts:
	build.xml
	buildScripts/ivy.xml
	src/core/lombok/eclipse/handlers/HandleLog.java
	src/core/lombok/extern/apachecommons/CommonsLog.java
	src/core/lombok/extern/java/Log.java
	src/core/lombok/extern/log4j/Log4j.java
	src/core/lombok/extern/log4j/Log4j2.java
	src/core/lombok/javac/handlers/HandleLog.java
	test/transform/resource/after-ecj/ValInTryWithResources.java

1 files changed, 12 insertions, 3 deletions

diff --git a/usage_examples/LogExample_pre.jpage b/usage_examples/LogExample_pre.jpage
index 7ab64cd4..ba27dd27 100644
--- a/usage_examples/LogExample_pre.jpage
+++ b/usage_examples/LogExample_pre.jpage
@@ -1,4 +1,5 @@
-import lombok.extern.slf4j.Log;
+import lombok.extern.java.Log;
+import lombok.extern.slf4j.Slf4j;
 
 @Log
 public class LogExample {
@@ -8,10 +9,18 @@ public class LogExample {
 	}
 }
 
-@Log(java.util.List.class)
+@Slf4j
 public class LogExampleOther {
 	
 	public static void main(String... args) {
-		log.warn("Something might be wrong here");
+		log.error("Something else is wrong here");
+	}
+}
+
+@CommonsLog(topic="CounterLog")
+public class LogExampleCategory {
+
+	public static void main(String... args) {
+		log.error("Calling the 'CounterLog' with a message");
 	}
 }