Log4j now properly configured

diff --git a/.gitattributes b/.gitattributes
index 11acf97db2464bad60cc1a6a1d8711d2e3322f21..2819c161c8e1b194669659029be96640c1cc270f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1198,11 +1198,11 @@ eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs -text
 eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.test/build.properties -text
 eu.etaxonomy.taxeditor.test/ide/eclipse/EDITor[!!-~]Tests.launch -text
+eu.etaxonomy.taxeditor.test/src/main/resources/log4j.xml -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/AbstractEditorTest.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ClassificationTest.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMenuHelper.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/LoginTest.java -text
-eu.etaxonomy.taxeditor.test/src/test/java/log4j.xml -text
 /pom.xml -text
 src/changes/changes.xml -text
 src/site/apt/download.apt -text

diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath
index 0d320420547ebcd5bb8ce01dcf6471df991af670..566550d95723c43269c99921040a6a2039c4bfa6 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -3,5 +3,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src/test/java"/>\r
+       <classpathentry kind="src" path="src/main/resources"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index da9867a5e41da1d60ec51e6799e6754bdee358fa..bc6fbe4df78f33a1f5a09d026c1c916826f9ad2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.apache.log4j;bundle-version="1.2.13",
  org.junit;bundle-version="4.8.1",
  org.eclipse.ui.ide;bundle-version="3.6.2",
  org.hamcrest;bundle-version="1.1.0"
+Eclipse-RegisterBuddy: org.apache.log4j

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/log4j.xml b/eu.etaxonomy.taxeditor.test/src/main/resources/log4j.xml
similarity index 100%
rename from eu.etaxonomy.taxeditor.test/src/test/java/log4j.xml
rename to eu.etaxonomy.taxeditor.test/src/main/resources/log4j.xml