Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8D543200B89 for ; Wed, 21 Sep 2016 13:33:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8BE0D160ADB; Wed, 21 Sep 2016 11:33:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D1202160ACF for ; Wed, 21 Sep 2016 13:33:35 +0200 (CEST) Received: (qmail 20746 invoked by uid 500); 21 Sep 2016 11:33:35 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 20737 invoked by uid 99); 21 Sep 2016 11:33:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2016 11:33:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 76AEEC227D for ; Wed, 21 Sep 2016 11:33:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.676 X-Spam-Level: X-Spam-Status: No, score=0.676 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.124] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id N1lpjYXO5JAi for ; Wed, 21 Sep 2016 11:33:33 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 1C8AF5FE34 for ; Wed, 21 Sep 2016 11:33:33 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 20D69E0239 for ; Wed, 21 Sep 2016 11:33:32 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 44FAB3A0248 for ; Wed, 21 Sep 2016 11:33:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1761720 - in /manifoldcf/trunk: CHANGES.txt connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java Date: Wed, 21 Sep 2016 11:33:30 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160921113331.44FAB3A0248@svn01-us-west.apache.org> archived-at: Wed, 21 Sep 2016 11:33:36 -0000 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(); - 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