--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Aug 13 18:37:13 2015 +0200
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Fri Aug 14 18:24:04 2015 +0200
@@ -29,11 +29,10 @@
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Map;
-import java.util.Collections;
-import java.util.StringTokenizer;
+import java.util.Arrays;
 
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.BasicDataSourceFactory;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSourceFactory;
 
 import org.apache.log4j.Logger;
 
@@ -208,8 +207,8 @@
             // by the BasicDataSourceFactory if you set it as a dbcpProperty
             String connectionInitSqls = props.getProperty("connectionInitSqls");
             if (connectionInitSqls != null) {
-                StringTokenizer tokenizer = new StringTokenizer(connectionInitSqls, ";");
-                ds.setConnectionInitSqls(Collections.list(tokenizer));
+                String[] statements = connectionInitSqls.split(";");
+                ds.setConnectionInitSqls(Arrays.asList(statements));
             }
 
             String validationQuery = props.getProperty("validationQuery");
@@ -220,7 +219,7 @@
             String maxWait = props.getProperty("maxWait");
             if (maxWait != null) {
                 try {
-                    ds.setMaxWait(Integer.parseInt(maxWait));
+                    ds.setMaxWaitMillis(Integer.parseInt(maxWait));
                 }
                 catch (NumberFormatException nfe) {
                     log.error(
@@ -256,8 +255,8 @@
         log.trace("Connection pool parameters:");
         log.trace("_ active connections: " + ds.getNumActive());
         log.trace("_ idle connections: " + ds.getNumIdle());
-        log.trace("_ max active: " + ds.getMaxActive());
-        if (ds.getNumActive() == ds.getMaxActive()) {
+        log.trace("_ max active: " + ds.getMaxTotal());
+        if (ds.getNumActive() == ds.getMaxTotal()) {
             log.warn("Maximum number of database connections in pool in use!");
         }
         Connection conn = ds.getConnection();