Author: kwright
Date: Wed Sep 21 11:33:30 2016
New Revision: 1761720
URL: http://svn.apache.org/viewvc?rev=1761720&view=rev
Log:
Fix for CONNECTORS-1340. Committed on behalf of Julien Massiera.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1761720&r1=1761719&r2=1761720&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Sep 21 11:33:30 2016
@@ -3,6 +3,9 @@ $Id$
======================= 2.6-dev =====================
+CONNECTORS-1340: Revise connection strings for sybase and for
+Oracle. It's not clear why these were working before, given the change.
+(Julien Massiera)
CONNECTORS-1337: Update POI jars to make them consistent with
Tika 1.13.
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=1761720&r1=1761719&r2=1761720&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
Wed Sep 21 11:33:30 2016
@@ -43,11 +43,11 @@ public class JDBCConnectionFactory
static
{
driverMap = new HashMap<String,String>();
- driverMap.put("oracle:thin:@","oracle.jdbc.OracleDriver");
- driverMap.put("postgresql:","org.postgresql.Driver");
- 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("oracle:thin:@", "oracle.jdbc.OracleDriver");
+ driverMap.put("postgresql://", "org.postgresql.Driver");
+ 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");
try
{
_pool = new ConnectionPoolManager(120,false);
@@ -97,7 +97,7 @@ public class JDBCConnectionFactory
if (driverClassName == null)
throw new ManifoldCFException("Unrecognized jdbc provider:
'"+providerName+"'");
- String dburl = "jdbc:" + providerName + "//" + jdbcDriverString;
+ String dburl = "jdbc:" + providerName + jdbcDriverString;
if (Logging.connectors != null && Logging.connectors.isDebugEnabled())
Logging.connectors.debug("JDBC: The connect string is '"+dburl+"'");
try
