From: n.hoffmann <n.hoffmann@localhost>
Date: Mon, 4 Apr 2011 09:11:53 +0000 (+0000)
Subject: Log4j now properly configured
X-Git-Tag: rcp.ss-first-working-version~132
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/aaa94eb0f0b55fd07c9467263c221333058cb4bf

Log4j now properly configured
---

diff --git a/.gitattributes b/.gitattributes
index 11acf97db..2819c161c 100644
--- 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 0d3204205..566550d95 100644
--- 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"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index da9867a5e..bc6fbe4df 100644
--- 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