X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.project%2Fsrc%2Forg%2Fsimantics%2Fproject%2Fmanagement%2FServerManager.java;h=205706c48c0bab2e7b63d864540f0f70a37f4572;hp=56cf3254c465300a5a8e1188d2015e9b58a37bca;hb=72fb2b54adeee15fa47deb223e69d2dbfb2ab83f;hpb=4cf3ca93d6e26c7434259fcf38b4d9db3c681a6f

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