You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/09/14 17:48:52 UTC
svn commit: r1702978 - in /jackrabbit/oak/branches/1.2: ./ oak-core/pom.xml
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
oak-jcr/pom.xml oak-run/pom.xml
Author: reschke
Date: Mon Sep 14 15:48:52 2015
New Revision: 1702978
URL: http://svn.apache.org/r1702978
Log:
OAK-2986: RDBDataSourceFactory: switch to tomcat datasource implementation (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/pom.xml
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
jackrabbit/oak/branches/1.2/oak-jcr/pom.xml
jackrabbit/oak/branches/1.2/oak-run/pom.xml
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 15:48:52 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272,1702387,1702405,1702423
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272,1702387,1702405,1702423,1702942,1702960
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/pom.xml?rev=1702978&r1=1702977&r2=1702978&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-core/pom.xml Mon Sep 14 15:48:52 2015
@@ -297,12 +297,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -354,5 +348,11 @@
<artifactId>commons-lang</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java?rev=1702978&r1=1702977&r2=1702978&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java Mon Sep 14 15:48:52 2015
@@ -16,19 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.logging.Logger;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.BasicDataSource;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.slf4j.LoggerFactory;
@@ -65,14 +58,24 @@ public class RDBDataSourceFactory {
}
try {
- BasicDataSource bds = new BasicDataSource();
LOG.debug("Getting driver for " + url);
Driver d = DriverManager.getDriver(url);
- bds.setDriverClassName(d.getClass().getName());
- bds.setUsername(username);
- bds.setPassword(passwd);
- bds.setUrl(url);
- return new CloseableDataSource(bds);
+
+ String classname = "org.apache.tomcat.jdbc.pool.DataSource";
+ try {
+ Class<?> dsclazz = Class.forName(classname);
+ DataSource ds = (DataSource)dsclazz.newInstance();
+ dsclazz.getMethod("setDriverClassName", String.class).invoke(ds, d.getClass().getName());
+ dsclazz.getMethod("setUsername", String.class).invoke(ds, username);
+ dsclazz.getMethod("setPassword", String.class).invoke(ds, passwd);
+ dsclazz.getMethod("setUrl", String.class).invoke(ds, url);
+ return ds;
+ }
+ catch (Exception ex) {
+ String message = "trying to create datasource " + classname;
+ LOG.info(message, ex);
+ throw new DocumentStoreException(message, ex);
+ }
} catch (SQLException ex) {
String message = "trying to obtain driver for " + url;
LOG.info(message, ex);
@@ -83,77 +86,4 @@ public class RDBDataSourceFactory {
public static DataSource forJdbcUrl(String url, String username, String passwd) {
return forJdbcUrl(url, username, passwd, null);
}
-
- /**
- * A {@link Closeable} {@link DataSource} based on a {@link BasicDataSource}
- * .
- */
- private static class CloseableDataSource implements DataSource, Closeable {
-
- private BasicDataSource ds;
-
- public CloseableDataSource(BasicDataSource ds) {
- this.ds = ds;
- }
-
- @Override
- public PrintWriter getLogWriter() throws SQLException {
- return this.ds.getLogWriter();
- }
-
- @Override
- public int getLoginTimeout() throws SQLException {
- return this.ds.getLoginTimeout();
- }
-
- @Override
- public void setLogWriter(PrintWriter pw) throws SQLException {
- this.ds.setLogWriter(pw);
- }
-
- @Override
- public void setLoginTimeout(int t) throws SQLException {
- this.ds.setLoginTimeout(t);
- }
-
- @Override
- public boolean isWrapperFor(Class<?> c) throws SQLException {
- return this.ds.isWrapperFor(c);
- }
-
- @Override
- public <T> T unwrap(Class<T> c) throws SQLException {
- return this.ds.unwrap(c);
- }
-
- @Override
- public void close() throws IOException {
- try {
- this.ds.close();
- } catch (SQLException ex) {
- throw new IOException("closing data source " + this.ds, ex);
- }
- }
-
- @Override
- public Connection getConnection() throws SQLException {
- return this.ds.getConnection();
- }
-
- @Override
- public Connection getConnection(String user, String passwd) throws SQLException {
- return this.ds.getConnection(user, passwd);
- }
-
- // needed in Java 7...
- @SuppressWarnings("unused")
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- throw new SQLFeatureNotSupportedException();
- }
-
- @Override
- public String toString() {
- return this.getClass().getName() + " wrapping a " + this.ds.toString();
- }
- }
}
Modified: jackrabbit/oak/branches/1.2/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/pom.xml?rev=1702978&r1=1702977&r2=1702978&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/pom.xml Mon Sep 14 15:48:52 2015
@@ -340,9 +340,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.2/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-run/pom.xml?rev=1702978&r1=1702977&r2=1702978&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-run/pom.xml Mon Sep 14 15:48:52 2015
@@ -277,6 +277,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>