1 files changed, 29 insertions, 19 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java
index d089511..d99a18a 100755
--- a/src/main/java/io/trygvis/esper/testing/Config.java
+++ b/src/main/java/io/trygvis/esper/testing/Config.java
@@ -1,48 +1,58 @@
 package io.trygvis.esper.testing;
 
+import ch.qos.logback.classic.*;
+import ch.qos.logback.core.util.*;
 import fj.data.*;
-import org.apache.commons.httpclient.protocol.*;
-import static org.apache.commons.lang.StringUtils.*;
-import org.apache.log4j.*;
-
 import java.io.*;
 import java.util.*;
+import org.apache.commons.httpclient.protocol.*;
+import org.slf4j.*;
+
+import static org.apache.commons.lang.StringUtils.*;
 
 public class Config {
     public final String gitoriousUrl;
     public final Option<String> gitoriousSessionValue;
     public final String nexusUrl;
 
-    public Config(String gitoriousUrl, Option<String> gitoriousSessionValue, String nexusUrl) {
+    public final String databaseDriver;
+    public final String databaseUrl;
+    public final String databaseUsername;
+    public final String databasePassword;
+
+    public Config(String gitoriousUrl, Option<String> gitoriousSessionValue, String nexusUrl, String databaseDriver, String databaseUrl, String databaseUsername, String databasePassword) {
         this.gitoriousUrl = gitoriousUrl;
         this.gitoriousSessionValue = gitoriousSessionValue;
         this.nexusUrl = nexusUrl;
+        this.databaseDriver = databaseDriver;
+        this.databaseUrl = databaseUrl;
+        this.databaseUsername = databaseUsername;
+        this.databasePassword = databasePassword;
     }
 
     public static Config loadFromDisk() throws IOException {
-        configureLog4j();
-
-        Protocol.registerProtocol("https", new Protocol("https", (ProtocolSocketFactory) new EasySSLProtocolSocketFactory(), 443));
+        initLogging();
 
         Properties properties = new Properties();
         try (FileInputStream inputStream = new FileInputStream("config.properties")) {
             properties.load(inputStream);
         }
 
+        String driver = trimToNull(properties.getProperty("database.driver"));
+
+//        Class.forName(driver);
+
         return new Config(trimToNull(properties.getProperty("gitorious.url")),
                 Option.fromNull(trimToNull(properties.getProperty("gitorious.sessionValue"))),
-                trimToNull(properties.getProperty("nexus.url")));
+                trimToNull(properties.getProperty("nexus.url")),
+                driver,
+                trimToNull(properties.getProperty("database.url")),
+                trimToNull(properties.getProperty("database.username")),
+                trimToNull(properties.getProperty("database.password")));
     }
 
-    public static void configureLog4j() {
-        Properties properties = new Properties();
-        properties.setProperty("log4j.rootLogger", "DEBUG, A1");
-        properties.setProperty("log4j.logger.httpclient.wire.content", "INFO");
-        properties.setProperty("log4j.logger.httpclient.wire.header", "INFO");
-        properties.setProperty("log4j.logger.org.apache.commons.httpclient", "INFO");
-        properties.setProperty("log4j.appender.A1", "org.apache.log4j.ConsoleAppender");
-        properties.setProperty("log4j.appender.A1.layout", "org.apache.log4j.PatternLayout");
-        properties.setProperty("log4j.appender.A1.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n");
-        PropertyConfigurator.configure(properties);
+    private static void initLogging() {
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        StatusPrinter.print(lc);
     }
 }