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

diff --git a/source/mir/storage/DatabaseAdaptorPostgresql.java b/source/mir/storage/DatabaseAdaptorPostgresql.java
index f00c5deb..87130746 100755
--- a/source/mir/storage/DatabaseAdaptorPostgresql.java
+++ b/source/mir/storage/DatabaseAdaptorPostgresql.java
@@ -1,56 +1,70 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
 package mir.storage;
 
-import java.util.*;
-import mir.misc.*;
+import java.util.Properties;
+
+import mir.config.MirPropertiesConfiguration;
+import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+
 
 /**
- * <b>Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor für Postgresql-Datenbanken
+ * <b>Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor f?r Postgresql-Datenbanken
  *
  * @author <RK>
  * @version 30.12.2000
  */
+public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor {
+  public String getDriver() throws PropertiesConfigExc {
+    return MirPropertiesConfiguration.instance().getString("Adaptor.PostgreSQL.Driver");
+  }
 
-public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor{
+  public String getURL(String user, String pass, String host)
+    throws PropertiesConfigExc {
+    return MirPropertiesConfiguration.instance().getString("Adaptor.PostgreSQL.URL");
+  }
 
-//    private static String url = "jdbc:postgresql://localhost:5432/mir";
-// just testing
+  public boolean hasLimit() {
+    return true;
+  }
 
-    private static String url = "jdbc:postgresql://localhost:5432/mir_unstable";
-    private static String driver = "org.postgresql.Driver";
+  public boolean reverseLimit() {
+    return true;
+  }
 
-    public String getDriver() {
-    	return driver;
-    }
+  public Properties getProperties(String user, String password) {
+    return null;
+  }
 
-    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;
-    }
-
-    public  boolean hasLimit() {
-      return true;
-    }
-
-    public boolean reverseLimit() {
-      return true;
-    }
-
-    public Properties getProperties(String user, String password) {
-      return null;
-    }
-
-    public String getLastInsertSQL(Database theDB) {
-           return "select currval('"+theDB.getCoreTable()+"_id_seq')";
-    }
+  public String getLastInsertSQL(Database theDB) {
+    return "select currval('" + theDB.getCoreTable() + "_id_seq')";
+  }
 }
-
-