X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Fstorage%2FDatabaseAdaptorPostgresql.java;h=9954a4b8321aeefc704d4ed215fffde8e194d49f;hb=ba516e7b82c557b25424da073a598cd6d2f71b28;hp=f00c5debf8da578d3b6e3d2fb2fcbb79ede53f4e;hpb=40202b3d3b830961e0786a6af1f144844c403836;p=mir.git

diff --git a/source/mir/storage/DatabaseAdaptorPostgresql.java b/source/mir/storage/DatabaseAdaptorPostgresql.java
index f00c5deb..9954a4b8 100755
--- a/source/mir/storage/DatabaseAdaptorPostgresql.java
+++ b/source/mir/storage/DatabaseAdaptorPostgresql.java
@@ -12,28 +12,12 @@ import mir.misc.*;
 
 public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor{
 
-//    private static String url = "jdbc:postgresql://localhost:5432/mir";
-// just testing
-
-    private static String url = "jdbc:postgresql://localhost:5432/mir_unstable";
-    private static String driver = "org.postgresql.Driver";
-
     public String getDriver() {
-    	return driver;
+    	return MirConfig.getProp("Adaptor.PostgreSQL.Driver");
     }
 
     public String getURL(String user, String pass, String host) {
-	    return url;
-    }
-
-    public static void setUrl(String u) throws Exception {
-        if (!url.startsWith("jdbc:"))
-            throw new Exception("Database Adaptor URL must begin with: \"jdbc:\"");
-        url = u;
-    }
-
-    public static void setDriver(String d) {
-        driver = d;
+	    return MirConfig.getProp("Adaptor.PostgreSQL.URL");
     }
 
     public  boolean hasLimit() {