From 5feacba885888b72ebe3ee79aae5c1a2d6e85d62 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 12 Sep 2011 07:19:03 +0000
Subject: [PATCH] LogInitializer.initDebug() removed because it does not make
 sense to have two methods because the static Logger factory can be
 initialized only once.

SVN: 22865
---
 .../cisd/common/logging/LogInitializer.java   | 30 -------------------
 .../authorization/CapabilityMapTest.java      |  2 +-
 .../DefaultAccessControllerTest.java          |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/common/source/java/ch/systemsx/cisd/common/logging/LogInitializer.java b/common/source/java/ch/systemsx/cisd/common/logging/LogInitializer.java
index 77f0c8ec0f9..76ea0fc8f0a 100644
--- a/common/source/java/ch/systemsx/cisd/common/logging/LogInitializer.java
+++ b/common/source/java/ch/systemsx/cisd/common/logging/LogInitializer.java
@@ -142,36 +142,6 @@ public class LogInitializer
      * </p>
      */
     public final static synchronized void init()
-    {
-        init(false);
-    }
-
-    /**
-     * Initializes logging system for log level DEBUG. Does nothing if already initialized.
-     * <p>
-     * Logging configuration file is assumed to be in
-     * <code>&lt;working directory&gt;/etc/log.xml</code>. If not found we look for a classpath
-     * resource named <code>/etc/log.xml</code>.<br>
-     * If nothing found in both locations <code>org.apache.log4j.BaseConfigurator.configure()</code>
-     * is used.
-     * </p>
-     */
-    public final static synchronized void initDebug()
-    {
-        init(true);
-    }
-
-    /**
-     * Initializes logging system. Does nothing if already initialized.
-     * <p>
-     * Logging configuration file is assumed to be in
-     * <code>&lt;working directory&gt;/etc/log.xml</code>. If not found we look for a classpath
-     * resource named <code>/etc/log.xml</code>.<br>
-     * If nothing found in both locations <code>org.apache.log4j.BaseConfigurator.configure()</code>
-     * is used.
-     * </p>
-     */
-    private final static synchronized void init(boolean debug)
     {
         if (initialized)
         {
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java
index 212098c72a1..9faa7703bdb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java
@@ -38,7 +38,7 @@ public class CapabilityMapTest
     @BeforeClass
     public void init()
     {
-        LogInitializer.initDebug();
+        LogInitializer.init();
     }
 
     @Capability("A")
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java
index 70f08e3cde0..8219b26e9d4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java
@@ -58,7 +58,7 @@ public final class DefaultAccessControllerTest
     @BeforeTest
     void init()
     {
-        LogInitializer.initDebug();
+        LogInitializer.init();
         final File capFile = new File("etc/capabilities");
         capFile.delete();
         capFile.deleteOnExit();
-- 
GitLab