svn commit: r1775312 - in /manifoldcf/branches/release-2.6-branch: ./ connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/ connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ con...

[kw...@apache.org]

Author: kwright
Date: Tue Dec 20 15:37:59 2016
New Revision: 1775312

URL: http://svn.apache.org/viewvc?rev=1775312&view=rev
Log:
Pull up fix for CONNECTORS-1360 from trunk.

Modified:
    manifoldcf/branches/release-2.6-branch/   (props changed)
    manifoldcf/branches/release-2.6-branch/CHANGES.txt
    manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
    manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java

Propchange: manifoldcf/branches/release-2.6-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 15:37:59 2016
@@ -138,4 +138,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1774667,1774670,1775304,1775309
+/manifoldcf/trunk:1774667,1774670,1775304,1775309,1775311

Modified: manifoldcf/branches/release-2.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/CHANGES.txt?rev=1775312&r1=1775311&r2=1775312&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.6-branch/CHANGES.txt Tue Dec 20 15:37:59 2016
@@ -4,6 +4,10 @@ $Id$
 
 ======================= Release 2.6 =====================
 
+CONNECTORS-1360: Fix MySQL and Sybase handling in the JDBC
+connector and authority connector.
+(Furkan KAMACI)
+
 CONNECTORS-1362: Don't output the stage_id field for jobs in the API.
 It's not accepted for readback.
 (Cathal Mcguinness, Karl Wright)

Modified: manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java?rev=1775312&r1=1775311&r2=1775312&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java (original)
+++ manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java Tue Dec 20 15:37:59 2016
@@ -445,10 +445,10 @@ public class JDBCAuthority extends BaseA
 "    <td class=\"description\"><nobr>" + Messages.getBodyString(locale, "JDBCAuthority.DatabaseType2") + "</nobr></td><td class=\"value\">\n"+
 "      <select multiple=\"false\" name=\"databasetype\" size=\"2\">\n"+
 "        <option value=\"oracle:thin:@\" " + (lJdbcProvider.equals("oracle:thin:@") ? "selected=\"selected\"" : "") + ">Oracle</option>\n"+
-"        <option value=\"postgresql:\" " + (lJdbcProvider.equals("postgresql:") ? "selected=\"selected\"" : "") + ">Postgres SQL</option>\n"+
-"        <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=\"postgresql://\" " + (lJdbcProvider.equals("postgresql:") ? "selected=\"selected\"" : "") + ">Postgres SQL</option>\n"+
+"        <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"+
 "      </select>\n"+
 "    </td>\n"+
 "  </tr>\n"+

Modified: manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1775312&r1=1775311&r2=1775312&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Tue Dec 20 15:37:59 2016
@@ -1060,10 +1060,10 @@ public class JDBCConnector extends org.a
 "    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"JDBCConnector.DatabaseType2") + "</nobr></td><td class=\"value\">\n"+
 "      <select multiple=\"false\" name=\"databasetype\" size=\"2\">\n"+
 "        <option value=\"oracle:thin:@\" "+(jdbcProvider.equals("oracle:thin:@")?"selected=\"selected\"":"")+">Oracle</option>\n"+
-"        <option value=\"postgresql:\" "+(jdbcProvider.equals("postgresql:")?"selected=\"selected\"":"")+">Postgres SQL</option>\n"+
-"        <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=\"postgresql://\" "+(jdbcProvider.equals("postgresql:")?"selected=\"selected\"":"")+">Postgres SQL</option>\n"+
+"        <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"+
 "      </select>\n"+
 "    </td>\n"+
 "  </tr>\n"+

Modified: manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java?rev=1775312&r1=1775311&r2=1775312&view=diff
==============================================================================
--- manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java (original)
+++ manifoldcf/branches/release-2.6-branch/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/jdbc/JDBCConnectionFactory.java Tue Dec 20 15:37:59 2016
@@ -46,7 +46,7 @@ public class JDBCConnectionFactory
     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("jtds:sybase://", "net.sourceforge.jtds.jdbc.Driver");
     driverMap.put("mysql://", "com.mysql.jdbc.Driver");
     try
     {