svn commit: r1748747 - in /jackrabbit/oak/trunk/oak-core: pom.xml src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java

[reschke]

Author: reschke
Date: Thu Jun 16 15:37:06 2016
New Revision: 1748747

URL: http://svn.apache.org/viewvc?rev=1748747&view=rev
Log:
OAK-4477: RDBDatasourceFactory: use pool config more similar to sling 
datasource defaults, also upgrade to latest tomcat-jdbc version - reverted due 
to test failures with Derby

Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1748747&r1=1748746&r2=1748747&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Thu Jun 16 15:37:06 2016
@@ -338,7 +338,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>7.0.69</version>
+      <version>7.0.64</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java?rev=1748747&r1=1748746&r2=1748747&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
 Thu Jun 16 15:37:06 2016
@@ -77,9 +77,6 @@ public class RDBDataSourceFactory {
                 dsclazz.getMethod("setUsername", String.class).invoke(ds, 
username);
                 dsclazz.getMethod("setPassword", String.class).invoke(ds, 
passwd);
                 dsclazz.getMethod("setUrl", String.class).invoke(ds, url);
-                dsclazz.getMethod("setJdbcInterceptors", 
String.class).invoke(ds,
-                        
System.getProperty("org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory.jdbcInterceptors",
-                                
"StatementCache;SlowQueryReport(threshold=10000);ConnectionState"));
                 return new CloseableDataSource(ds);
             } catch (Exception ex) {
                 String message = "trying to create datasource " + classname;