corrected merge to latest snapshot version

[taxeditor.git] / eu.etaxonomy.taxeditor.test / src / test / java / eu / etaxonomy / taxeditor / lazyloading / CdmEntityCacherTest.java

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java
index d935013bfb21ae27e2f746b385c8d68282475491..6639934751042dc7d875f6247bd51b9f206202be 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.lazyloading;
 
 import java.util.UUID;
 
-import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.junit.Assert;
@@ -26,7 +25,6 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.taxeditor.httpinvoker.BaseRemotingTest;
-import eu.etaxonomy.taxeditor.httpinvoker.CDMServer;
 
 /**
  * @author cmathew
@@ -49,10 +47,6 @@ public class CdmEntityCacherTest extends BaseRemotingTest {
 
     @BeforeClass
     public static void initializePolytomousKeyTest() {
-        logger.setLevel(Level.INFO);
-        CDMServer.getInstance().setKeepServerRunning(true);
-
-        //initializeController("default", "127.0.0.1", 8080, "", NomenclaturalCode.ICNAFP);
     }
 
     @Test