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
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
* @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
*/\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
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