From 60cee3bcdbc849b4e96ead4d71019f63e0c0473a Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 16 May 2011 01:35:14 +0000 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@96 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- ...DataAbstractSource.java => DruidAbstractDataSource.java} | 6 +++--- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/com/alibaba/druid/pool/{DruidDataAbstractSource.java => DruidAbstractDataSource.java} (99%) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java similarity index 99% rename from src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java rename to src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 018d893012..016a5c492d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -41,7 +41,7 @@ import com.alibaba.druid.util.DruidLoaderUtils; /** * @author wenshao */ -public abstract class DruidDataAbstractSource implements DataSource, DataSourceProxy, Serializable { +public abstract class DruidAbstractDataSource implements DataSource, DataSourceProxy, Serializable { private static final long serialVersionUID = 1L; @@ -626,9 +626,9 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP private final String url; private final Properties info; - private final DruidDataAbstractSource dataSource; + private final DruidAbstractDataSource dataSource; - public DruidPoolConnectionFactory(DruidDataAbstractSource dataSource) throws SQLException{ + public DruidPoolConnectionFactory(DruidAbstractDataSource dataSource) throws SQLException{ this.dataSource = dataSource; this.url = dataSource.getUrl(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 41d45a0f52..a2beb6a9c6 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -41,7 +41,7 @@ import com.alibaba.druid.util.JdbcUtils; /** * @author wenshao */ -public class DruidDataSource extends DruidDataAbstractSource implements DruidDataSourceMBean, Referenceable { +public class DruidDataSource extends DruidAbstractDataSource implements DruidDataSourceMBean, Referenceable { private static final long serialVersionUID = 1L;