Changeset 7521

Timestamp:

Nov 6, 2018, 9:00:49 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2130: Upgrade 3-rd party libraries

Removed the need for a db.driver setting in base.config since the driver can be automatically loaded from the db.url setting (using DriverManagager.getDriver(url)).

Location:

trunk

Files:

• config/dist/base.config (modified) (2 diffs)
• doc/src/docbook/admin/installation.xml (modified) (1 diff)
• doc/src/docbook/appendix/base.config.xml (modified) (2 diffs)
• doc/src/docbook/appendix/update_warnings.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/Application.java (modified) (1 diff)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ServiceSessionControl.java (modified) (1 diff)
• src/install/net/sf/basedb/install/InitDB.java (modified) (4 diffs)
• src/install/net/sf/basedb/install/OneTimeFix.java (modified) (4 diffs)
• src/test/TestUtil.java (modified) (4 diffs)
• src/test/net/sf/basedb/test/TestUtil.java (modified) (4 diffs)

trunk/config/dist/base.config

@@ -29 +29 @@
 # -----
 db.dialect          = org.hibernate.dialect.MySQL5InnoDBDialect
-db.driver           = com.mysql.cj.jdbc.Driver
 db.url              = jdbc:mysql://localhost/base2?characterEncoding=UTF-8&useCursorFetch=true&defaultFetchSize=100&useServerPrepStmts=true
 db.dynamic.catalog  = base2dynamic
@@ -39 +38 @@
 # --------
 #db.dialect          = org.hibernate.dialect.PostgreSQL9Dialect
-#db.driver           = org.postgresql.Driver
 #db.url              = jdbc:postgresql:base2
 #db.dynamic.schema   = dynamic

trunk/doc/src/docbook/admin/installation.xml

@@ -56 +56 @@
       </para>
 
-      <bridgehead>New JDBC driver for MySQL</bridgehead>
+      <bridgehead>The db.driver setting is no longer used</bridgehead>
       <para>
-        If you are using MySQL it is recommended that you change the 
-        <constant>db.driver</constant> setting in the <filename>base.config</filename> 
-        file to <constant>com.mysql.cj.jdbc.Driver</constant>. 
+        The JDBC driver to use is now found automatically based on
+        the <constant>db.url</constant> setting in the <filename>base.config</filename>
+        file. The <constant>db.driver</constant> setting can be removed.
       </para>
     </important>

trunk/doc/src/docbook/appendix/base.config.xml

@@ -40 +40 @@
   <itemizedlist>
     <listitem>
-      <property>db.dialect</property>, <property>db.driver</property>,
+      <property>db.dialect</property>,
       <property>db.url</property>, <property>db.username</property>,
       <property>db.password</property>: 
@@ -81 +81 @@
           </itemizedlist> 
           Other dialects may work but are not supported.
-        </para>
-      </listitem>
-    </varlistentry>
-    
-    <varlistentry>
-      <term><property>db.driver</property></term>
-      <listitem>
-        <para>
-          The JDBC driver to use when connecting to the database. Use:
-          <itemizedlist>
-          <listitem>
-            <userinput>com.mysql.jdbc.Driver</userinput> 
-            for MySQL
-          </listitem>
-          <listitem>
-            <userinput>org.postgresql.Driver</userinput> 
-            for PostgreSQL
-          </listitem>
-          </itemizedlist> 
-          Other JDBC drivers may work but are not supported.
         </para>
       </listitem>

trunk/doc/src/docbook/appendix/update_warnings.xml

@@ -39 +39 @@
     <title>BASE 3.14</title>
   
-    <bridgehead>New JDBC driver for MySQL</bridgehead>
-    <para>
-      If you are using MySQL it is recommended that you change the 
-      <constant>db.driver</constant> setting in the <filename>base.config</filename> 
-      file to <constant>com.mysql.cj.jdbc.Driver</constant>. 
+    <bridgehead>The db.driver setting is no longer used</bridgehead>
+    <para>
+      The JDBC driver to use is now found automatically based on
+      the <constant>db.url</constant> setting in the <filename>base.config</filename>
+      file. The <constant>db.driver</constant> setting can be removed.
     </para>
     

trunk/src/core/net/sf/basedb/core/Application.java

@@ -478 +478 @@
       
       log.info("db.dialect = " + Config.getString("db.dialect"));
-      log.info("db.driver = " + Config.getString("db.driver"));
       log.info("db.url = " + Config.getString("db.url"));
       log.info("db.username = " + Config.getString("db.username"));

trunk/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -291 +291 @@
     Properties baseConfig = new Properties();
     baseConfig.setProperty("hibernate.dialect", dialect);
-    baseConfig.setProperty("hibernate.connection.driver_class", Config.getString("db.driver", ""));
     baseConfig.setProperty("hibernate.connection.url", Config.getString("db.url", ""));
     baseConfig.setProperty("hibernate.connection.username", Config.getString("db.username", ""));

trunk/src/core/net/sf/basedb/core/ServiceSessionControl.java

@@ -521 +521 @@
       {
         registryBuilder.applySetting("hibernate.dialect", Config.getString("db.dialect", ""));
-        registryBuilder.applySetting("hibernate.connection.driver_class", Config.getString("db.driver", ""));
         if (actualCatalog != null)
         {

trunk/src/install/net/sf/basedb/install/InitDB.java

@@ -24 +24 @@
 
 import java.sql.Driver;
+import java.sql.DriverManager;
 import java.util.Arrays;
 import java.util.List;
@@ -39 +40 @@
 import net.sf.basedb.util.ConsoleProgressReporter;
 import net.sf.basedb.util.ChainedProgressReporter;
-import net.sf.basedb.util.ClassUtil;
 
 /**
@@ -198 +198 @@
   }
 
-  private static void showDbInfo(ProgressReporter progress)
+  static void showDbInfo(ProgressReporter progress)
   {
     final Properties properties = System.getProperties();
-    final String jdbcDriver = Config.getString("db.driver");
+    final String dbUrl = Config.getString("db.url");
+    String driverClass = "unknown class";
     String driverVersion = "unknown version";
     try
     {
-      final Driver driver = (Driver)ClassUtil.newInstance(Class.forName(jdbcDriver));
+      final Driver driver = DriverManager.getDriver(dbUrl);
+      driverClass = driver.getClass().getName();
       driverVersion = "version " + driver.getMajorVersion() + "." + driver.getMinorVersion();
     }
@@ -214 +216 @@
       "--System information-----------------------------\n" + 
       "BASE     : " + Version.getVersion() + "\n" + 
-      "Database : " + Config.getString("db.url") + "\n" + 
+      "Database : " + dbUrl + "\n" + 
       "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + jdbcDriver + "; " + driverVersion + "\n" +
+      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
       "Java     : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +

trunk/src/install/net/sf/basedb/install/OneTimeFix.java

@@ -25 +25 @@
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.Properties;
-
-
-
-
-
 
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.Config;
-import net.sf.basedb.core.ProgressReporter;
 import net.sf.basedb.core.SessionControl;
 import net.sf.basedb.core.Update;
 import net.sf.basedb.core.authentication.LoginRequest;
-import net.sf.basedb.util.ClassUtil;
 import net.sf.basedb.util.ConsoleProgressReporter;
 
@@ -79 +70 @@
         System.out.println(msg);
         waitForEnter();
-        showDbInfo(null);
+        InitDB.showDbInfo(null);
         System.out.println("Starting BASE. Please wait...");
         Application.start(false);
@@ -103 +94 @@
         System.out.println(msg);
         waitForEnter();
-        showDbInfo(null);
+        InitDB.showDbInfo(null);
         System.out.println("Starting BASE. Please wait...");
         Application.start(false);
@@ -136 +127 @@
   }
 
-  private static void showDbInfo(ProgressReporter progress)
-  {
-    final Properties properties = System.getProperties();
-    final String jdbcDriver = Config.getString("db.driver");
-    String driverVersion = "unknown version";
-    try
-    {
-      final Driver driver = (Driver)ClassUtil.newInstance(Class.forName(jdbcDriver));
-      driverVersion = "version " + driver.getMajorVersion() + "." + driver.getMinorVersion();
-    }
-    catch (Throwable t)
-    {}
-    
-    String message = 
-      "--System information-----------------------------\n" + 
-      "BASE     : " + Application.getMajorVersion() + "." +
-        Application.getMinorVersion() + "." + 
-        Application.getMaintenanceVersion() + "\n" + 
-      "Database : " + Config.getString("db.url") + "\n" + 
-      "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + jdbcDriver + "; " + driverVersion + "\n" +
-      "Java     : " + properties.getProperty("java.runtime.name") + "; " +
-        properties.getProperty("java.runtime.version") + "; " +
-        properties.getProperty("java.vendor") + "\n" + 
-      "OS       : " + properties.getProperty("os.name") +"; " +
-        properties.getProperty("os.arch") + "; " +
-        properties.getProperty("os.version") +"\n" +
-      "-------------------------------------------------";
-    if (progress != null)
-    {
-      progress.display(0, message);
-    }
-    else 
-    {
-      System.out.println(message);
-    }
-  }
-  
   public static String getOption(String[] args, String option, String defaultValue)
   {

trunk/src/test/TestUtil.java

@@ -29 +29 @@
 import net.sf.basedb.core.Version;
 import net.sf.basedb.core.authentication.LoginRequest;
-import net.sf.basedb.util.ClassUtil;
 
 import java.io.File;
@@ -37 +36 @@
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
+import java.sql.DriverManager;
 import java.util.Properties;
 
@@ -263 +263 @@
   {
     final Properties properties = System.getProperties();
-    final String jdbcDriver = Config.getString("db.driver");
+    final String dbUrl = Config.getString("db.url");
+    String driverClass = "unknown class";
     String driverVersion = "unknown version";
     String database = "Unknown database";
-    try
-    {
-      final Driver driver = (Driver)ClassUtil.newInstance(Class.forName(jdbcDriver));
+    
+    try
+    {
+      final Driver driver = DriverManager.getDriver(dbUrl);
+      driverClass = driver.getClass().getName();
       driverVersion = "version " + driver.getMajorVersion() + "." + driver.getMinorVersion();
       Properties p = new Properties();
       p.setProperty("user", Config.getString("db.username"));
       p.setProperty("password", Config.getString("db.password"));
-      Connection c = driver.connect(Config.getString("db.url"), p);
+      Connection c = driver.connect(dbUrl, p);
       DatabaseMetaData data = c.getMetaData();
       database = data.getDatabaseProductName() + " " + data.getDatabaseProductVersion();
@@ -287 +290 @@
       "Database : " + database + "\n" + 
       "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + jdbcDriver + "; " + driverVersion + "\n" +
-      "URL      : " + Config.getString("db.url") + "\n" +
+      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
+      "URL      : " + dbUrl + "\n" +
       "Java     : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +

trunk/src/test/net/sf/basedb/test/TestUtil.java

@@ -31 +31 @@
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
+import java.sql.DriverManager;
 import java.util.Properties;
 
@@ -38 +39 @@
 import net.sf.basedb.core.SessionControl;
 import net.sf.basedb.core.authentication.LoginRequest;
-import net.sf.basedb.util.ClassUtil;
 
 /**
@@ -236 +236 @@
   {
     final Properties properties = System.getProperties();
-    final String jdbcDriver = Config.getString("db.driver");
+    final String dbUrl = Config.getString("db.url");
+    String driverClass = "unknown class";
     String driverVersion = "unknown version";
     String database = "Unknown database";
     try
     {
-      final Driver driver = (Driver)ClassUtil.newInstance(Class.forName(jdbcDriver));
+      final Driver driver = DriverManager.getDriver(dbUrl);
+      driverClass = driver.getClass().getName();
       driverVersion = "version " + driver.getMajorVersion() + "." + driver.getMinorVersion();
       Properties p = new Properties();
       p.setProperty("user", Config.getString("db.username"));
       p.setProperty("password", Config.getString("db.password"));
-      Connection c = driver.connect(Config.getString("db.url"), p);
+      Connection c = driver.connect(dbUrl, p);
       DatabaseMetaData data = c.getMetaData();
       database = data.getDatabaseProductName() + " " + data.getDatabaseProductVersion();
@@ -261 +263 @@
       "Database : " + database + "\n" + 
       "Dialect  : " + Config.getString("db.dialect") + "\n" + 
-      "JDBC     : " + jdbcDriver + "; " + driverVersion + "\n" +
-      "URL      : " + Config.getString("db.url") + "\n" +
+      "JDBC     : " + driverClass + "; " + driverVersion + "\n" +
+      "URL      : " + dbUrl + "\n" +
       "Java     : " + properties.getProperty("java.runtime.name") + "; " +
         properties.getProperty("java.runtime.version") + "; " +