You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/25 00:26:16 UTC
svn commit: r1634146 - in /manifoldcf/branches/dev_1x: ./ framework/
framework/core/src/main/java/org/apache/manifoldcf/core/database/
Author: kwright
Date: Fri Oct 24 22:26:16 2014
New Revision: 1634146
URL: http://svn.apache.org/r1634146
Log:
Pull up fix for CONNECTORS-1083 from trunk.
Added:
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMariaDB.java
- copied unchanged from r1634145, manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMariaDB.java
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/build.xml
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/build.xml
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
manifoldcf/branches/dev_1x/pom.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1634145
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1634146&r1=1634145&r2=1634146&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Oct 24 22:26:16 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1083: Add support for MariaDB.
+(Markus Schuch)
+
CONNECTORS-1060: Implement Alfresco webscript connector integration
test.
(Maurizio Pillitu)
Modified: manifoldcf/branches/dev_1x/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/build.xml?rev=1634146&r1=1634145&r2=1634146&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/build.xml (original)
+++ manifoldcf/branches/dev_1x/build.xml Fri Oct 24 22:26:16 2014
@@ -1978,6 +1978,16 @@ Use Apache Forrest version forrest-0.9-d
</copy>
</target>
+ <target name="download-mariadb">
+ <antcall target="download-via-maven">
+ <param name="target" value="lib-proprietary"/>
+ <param name="project-path" value="org/mariadb/jdbc"/>
+ <param name="artifact-version" value="1.1.7"/>
+ <param name="artifact-name" value="mariadb-java-client"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-mysql">
<antcall target="download-via-maven">
<param name="target" value="lib-proprietary"/>
@@ -1998,7 +2008,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-proprietary-dependencies" depends="download-mysql,download-jtds"/>
+ <target name="download-proprietary-dependencies" depends="download-mariadb,download-mysql,download-jtds"/>
<target name="make-deps" depends="download-proprietary-dependencies,download-connectors-dependencies">
<ant dir="site" target="download-dependencies"/>
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1634145
Modified: manifoldcf/branches/dev_1x/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/build.xml?rev=1634146&r1=1634145&r2=1634146&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/build.xml Fri Oct 24 22:26:16 2014
@@ -89,6 +89,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</path>
@@ -433,6 +434,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</copy>
<copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
@@ -549,6 +551,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</copy>
<copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
@@ -676,6 +679,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</copy>
<copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
@@ -813,6 +817,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</copy>
<copy todir="build/webapp/combined-service-proprietary/WEB-INF/lib">
@@ -970,6 +975,7 @@
<include name="mysql*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</copy>
</target>
@@ -1203,6 +1209,7 @@
<include name="mysql-connector-java*.jar"/>
<include name="ojdbc*.jar"/>
<include name="jtds*.jar"/>
+ <include name="mariadb-java-client*.jar"/>
</fileset>
</path>
Modified: manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1634146&r1=1634145&r2=1634146&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java (original)
+++ manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java Fri Oct 24 22:26:16 2014
@@ -19,7 +19,6 @@
package org.apache.manifoldcf.core.database;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.core.system.ManifoldCF;
import org.apache.manifoldcf.core.system.Logging;
import java.util.*;
@@ -62,6 +61,12 @@ public class DBInterfaceMySQL extends Da
public DBInterfaceMySQL(IThreadContext tc, String databaseName, String userName, String password)
throws ManifoldCFException
{
+ this(tc,_driver,databaseName,userName,password);
+ }
+
+ protected DBInterfaceMySQL(IThreadContext tc, String jdbcDriverClass, String databaseName, String userName, String password)
+ throws ManifoldCFException
+ {
super(tc,getJdbcUrl(tc,databaseName),_driver,databaseName,userName,password);
cacheKey = CacheKeyFactory.makeDatabaseKey(this.databaseName);
lockManager = LockManagerFactory.make(tc);
@@ -76,6 +81,11 @@ public class DBInterfaceMySQL extends Da
return "jdbc:mysql://"+server+"/"+theDatabaseName+"?useUnicode=true&characterEncoding=utf8";
}
+ protected String getJdbcDriverClass()
+ {
+ return _driver;
+ }
+
/** Reinterpret an exception tossed by the database layer. We need to disambiguate the various kinds of exception that
* should be thrown.
*@param theException is the exception to reinterpret
@@ -622,7 +632,7 @@ public class DBInterfaceMySQL extends Da
// Connect to super database
- Database masterDatabase = new DBInterfaceMySQL(context,"mysql",adminUserName,adminPassword);
+ Database masterDatabase = new DBInterfaceMySQL(context,getJdbcDriverClass(),"mysql",adminUserName,adminPassword);
try
{
List list = new ArrayList();
@@ -667,7 +677,7 @@ public class DBInterfaceMySQL extends Da
throws ManifoldCFException
{
// Connect to super database
- Database masterDatabase = new DBInterfaceMySQL(context,"mysql",adminUserName,adminPassword);
+ Database masterDatabase = new DBInterfaceMySQL(context,getJdbcDriverClass(),"mysql",adminUserName,adminPassword);
try
{
masterDatabase.executeQuery("DROP DATABASE "+databaseName,null,null,invalidateKeys,null,false,0,null,null);
Modified: manifoldcf/branches/dev_1x/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/pom.xml?rev=1634146&r1=1634145&r2=1634146&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/pom.xml (original)
+++ manifoldcf/branches/dev_1x/pom.xml Fri Oct 24 22:26:16 2014
@@ -67,6 +67,7 @@
<xerces.version>2.10.0</xerces.version>
<xml-apis.version>1.4.01</xml-apis.version>
<jtds.version>1.2.4</jtds.version>
+ <mariadb.version>1.1.7</mariadb.version>
<servlet-api.version>3.1.0</servlet-api.version>
<jstl.version>1.2</jstl.version>
<glassfish.version>2.1.v20091210</glassfish.version>