some small changes delting unneeded imports. two new exceptions in mir.storage. usage...

[mir.git] / source / mir / storage / DatabaseAdaptorPostgresql.java

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