svn commit: r1902537 - in /manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf: authorities/authorities/jdbc/JDBCAuthority.java crawler/connectors/jdbc/JDBCConnector.java jdbc/JDBCConnectionFactory.java

[jmssiera]

Author: jmssiera
Date: Thu Jul  7 17:02:53 2022
New Revision: 1902537

URL: http://svn.apache.org/viewvc?rev=1902537&view=rev
Log:
CONNECTORS-1719: Handle MariaDB in JDBC connector

Modified:
    
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
    
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java

Modified: 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java?rev=1902537&r1=1902536&r2=1902537&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
 (original)
+++ 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
 Thu Jul  7 17:02:53 2022
@@ -449,6 +449,7 @@ public class JDBCAuthority extends BaseA
 "        <option value=\"jtds:sqlserver://\" " + 
(lJdbcProvider.equals("jtds:sqlserver:") ? "selected=\"selected\"" : "") + ">MS 
SQL Server (&gt; V6.5)</option>\n"+
 "        <option value=\"jtds:sybase://\" " + 
(lJdbcProvider.equals("jtds:sybase:") ? "selected=\"selected\"" : "") + 
">Sybase (&gt;= V10)</option>\n"+
 "        <option value=\"mysql://\" " + (lJdbcProvider.equals("mysql:") ? 
"selected=\"selected\"" : "") + ">MySQL (&gt;= V5)</option>\n"+
+"        <option value=\"mariadb://\" " + (lJdbcProvider.equals("mariadb:") ? 
"selected=\"selected\"" : "") + ">MariaDB</option>\n"+
 "      </select>\n"+
 "    </td>\n"+
 "  </tr>\n"+

Modified: 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1902537&r1=1902536&r2=1902537&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
 Thu Jul  7 17:02:53 2022
@@ -1077,6 +1077,7 @@ public class JDBCConnector extends org.a
 "        <option value=\"jtds:sqlserver://\" 
"+(jdbcProvider.equals("jtds:sqlserver:")?"selected=\"selected\"":"")+">MS SQL 
Server (&gt; V6.5)</option>\n"+
 "        <option value=\"jtds:sybase://\" 
"+(jdbcProvider.equals("jtds:sybase:")?"selected=\"selected\"":"")+">Sybase 
(&gt;= V10)</option>\n"+
 "        <option value=\"mysql://\" 
"+(jdbcProvider.equals("mysql:")?"selected=\"selected\"":"")+">MySQL (&gt;= 
V5)</option>\n"+
+"        <option value=\"mariadb://\" 
"+(jdbcProvider.equals("mariadb:")?"selected=\"selected\"":"")+">MariaDB</option>\n"+
 "      </select>\n"+
 "    </td>\n"+
 "  </tr>\n"+

Modified: 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java?rev=1902537&r1=1902536&r2=1902537&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java
 (original)
+++ 
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java
 Thu Jul  7 17:02:53 2022
@@ -48,6 +48,7 @@ public class JDBCConnectionFactory
     driverMap.put("jtds:sqlserver://", "net.sourceforge.jtds.jdbc.Driver");
     driverMap.put("jtds:sybase://", "net.sourceforge.jtds.jdbc.Driver");
     driverMap.put("mysql://", "com.mysql.jdbc.Driver");
+    driverMap.put("mariadb://", "org.mariadb.jdbc.Driver");
     try
     {
       _pool = new ConnectionPoolManager(120,false);