import java.util.zip.ZipEntry;\r
import java.util.zip.ZipInputStream;\r
\r
-import org.apache.log4j.Logger;\r
import org.simantics.db.DatabaseUserAgent;\r
import org.simantics.db.Driver;\r
import org.simantics.db.Manager;\r
import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.utils.FileUtils;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
\r
public class ServerManagerFactory {\r
- public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {\r
- Driver driver = Manager.getDriver(databaseId);\r
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServerManagerFactory.class);\r
+\r
+ public static ServerManager create(String databaseDriverId, String address) throws IOException, DatabaseException {\r
+ Driver driver = Manager.getDriver(databaseDriverId);\r
if (driver == null)\r
- throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!");\r
- System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString());\r
- DatabaseUserAgent agent = Manager.getUserAgent(databaseId);\r
+ throw new IllegalArgumentException("Database driver with ID " + databaseDriverId + " could not be found!");\r
+ LOGGER.info("ServerManagerFactory.create called with id {}, driver is {}.", databaseDriverId, driver);\r
+ DatabaseUserAgent agent = Manager.getUserAgent(databaseDriverId);\r
if (agent != null)\r
driver.setDatabaseUserAgent(address, agent);\r
return new ServerManager(driver);\r
* @throws IOException\r
*/\r
private static void extractZip(InputStream zipInput, File dst) throws IOException {\r
- Logger myLogger = Logger.getLogger(FileUtils.class);\r
byte[] buf = new byte[8192];\r
ZipInputStream zis = new ZipInputStream(zipInput);\r
ZipEntry entry;\r
while (entry != null) {\r
// for each entry to be extracted\r
String name = entry.getName();\r
- myLogger.debug("Extracting "+name);\r
+ LOGGER.debug("Extracting "+name);\r
File file = new File(dst, name);\r
\r
if (entry.isDirectory())\r