Utilize slf4j

[simantics/platform.git] / bundles / org.simantics.project / src / org / simantics / project / management / ServerManager.java

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManager.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManager.java
index 56cf3254c465300a5a8e1188d2015e9b58a37bca..205706c48c0bab2e7b63d864540f0f70a37f4572 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManager.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManager.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.Properties;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.simantics.databoard.util.StreamUtil;\r
 import org.simantics.db.Driver;\r
 import org.simantics.db.Driver.Management;\r
@@ -40,6 +39,8 @@ import org.simantics.db.service.XSupport;
 import org.simantics.graph.db.CoreInitialization;\r
 import org.simantics.layer0.DatabaseManagementResource;\r
 import org.simantics.layer0.Layer0;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 /**\r
  * Server Manager handles starting and pooling of ProCore server instances.\r
@@ -47,7 +48,8 @@ import org.simantics.layer0.Layer0;
  * @author Toni Kalajainen <toni.kalajainen@vtt.fi>\r
  */\r
 public class ServerManager {\r
-\r
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServerManager.class);\r
+    \r
        /** Default properties with default user and password */\r
        public static final Properties DEFAULT;\r
 \r
@@ -81,8 +83,7 @@ public class ServerManager {
         */\r
        public Session createDatabase(File databaseDirectory) throws DatabaseException {\r
                try {\r
-                       Logger myLogger = Logger.getLogger(ServerManager.class);\r
-                       myLogger.debug("Creating database to "+ databaseDirectory);\r
+                   LOGGER.debug("Creating database to "+ databaseDirectory);\r
 \r
             Session session = null;\r
             ServerEx server1 = getServer(databaseDirectory);\r
@@ -206,8 +207,7 @@ public class ServerManager {
                     if (server.isActive())\r
                         server.stop();\r
                 } catch (DatabaseException e) {\r
-                    Logger myLogger = Logger.getLogger(ServerManager.class);\r
-                    myLogger.error(e);\r
+                    LOGGER.error("Failed to stop database server.", e);\r
                 }\r
                        }\r
                        servers.clear();\r