+ slf4j to cayenne-dbcp2
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9c9a35d4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9c9a35d4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9c9a35d4 Branch: refs/heads/master Commit: 9c9a35d4ec4abc55541a3c69c94771cf4081cef9 Parents: af0a2fc Author: Maxim Petrusevich <maks1...@gmail.com> Authored: Wed Apr 12 12:12:04 2017 +0300 Committer: Maxim Petrusevich <maks1...@gmail.com> Committed: Wed Apr 12 12:12:04 2017 +0300 ---------------------------------------------------------------------- cayenne-dbcp2/pom.xml | 5 +++++ .../cayenne/configuration/server/DBCPDataSourceFactory.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c9a35d4/cayenne-dbcp2/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml index 91fe6d7..85855ee 100644 --- a/cayenne-dbcp2/pom.xml +++ b/cayenne-dbcp2/pom.xml @@ -34,6 +34,11 @@ <artifactId>commons-dbcp2</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <!-- Test dependencies --> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c9a35d4/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java index 69c5bdd..54d3a6d 100644 --- a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java +++ b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java @@ -28,8 +28,8 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.resource.Resource; import org.apache.commons.dbcp2.BasicDataSourceFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link DataSourceFactory} based on DBCP2 connection pool library. @@ -38,7 +38,7 @@ public class DBCPDataSourceFactory implements DataSourceFactory { private static final String DBCP2_PROPERTIES = "dbcp2.properties"; - private static final Log logger = LogFactory.getLog(DBCPDataSourceFactory.class); + private static final Logger logger = LoggerFactory.getLogger(DBCPDataSourceFactory.class); @Override public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
