配置和apache dbcp一致

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@5 b9813039-fb51-4c41-a8b9-e21c2acb5095

src/main/java/com/alibaba/druid/filter/stat/StatFilter.java

@@ -80,7 +80,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
 
 		ConcurrentMap<String, JdbcDataSourceStat> dataSourceStats = JdbcStatManager.getInstance().getDataSources();
 
-		String url = dataSource.getJdbcUrl();
+		String url = dataSource.getUrl();
 		JdbcDataSourceStat stat = dataSourceStats.get(url);
 		if (stat == null) {
 			dataSourceStats.putIfAbsent(url, new JdbcDataSourceStat(dataSource.getName(), url));
@@ -611,7 +611,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
 
 	@Override
 	public String getConnectionUrl() {
-		return dataSource.getJdbcUrl();
+		return dataSource.getUrl();
 	}
 
 	public final JdbcSqlStat createSqlStat(StatementProxy statement, String sql) {
@@ -620,7 +620,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
 			JdbcSqlStat newSqlStat = new JdbcSqlStat(sql);
 			if (dataSourceStat.getSqlStatMap().putIfAbsent(sql, newSqlStat) == null) {
 				newSqlStat.setId(JdbcStatManager.getInstance().generateSqlId());
-				newSqlStat.setDataSource(this.dataSource.getJdbcUrl());
+				newSqlStat.setDataSource(this.dataSource.getUrl());
 			}
 
 			sqlStat = dataSourceStat.getSqlStatMap().get(sql);

src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java

@@ -277,11 +277,11 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
         this.maxActive = maxActive;
     }
 
-    public String getUser() {
+    public String getUsername() {
         return user;
     }
 
-    public void setUser(String user) {
+    public void setUsername(String user) {
         if (inited) {
             throw new UnsupportedOperationException();
         }
@@ -313,7 +313,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
         this.properties = properties;
     }
 
-    public String getJdbcUrl() {
+    public String getUrl() {
         return jdbcUrl;
     }
 
@@ -333,7 +333,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
         return driverClass;
     }
 
-    public void setDriverClass(String driverClass) {
+    public void setDriverClassName(String driverClass) {
         if (inited) {
             throw new UnsupportedOperationException();
         }
@@ -402,14 +402,14 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP
 
         public DruidPoolConnectionFactory(DruidDataAbstractSource dataSource){
             this.dataSource = dataSource;
-            this.url = dataSource.getJdbcUrl();
+            this.url = dataSource.getUrl();
 
             Properties properties = dataSource.getProperties();
             String user;
             if (dataSource.getUserCallback() != null) {
                 user = dataSource.getUserCallback().getName();
             } else {
-                user = dataSource.getUser();
+                user = dataSource.getUsername();
             }
 
             String password;

src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java

@@ -15,11 +15,11 @@ public interface DruidDataSourceMBean {
 
     int getInitialSize();
 
-    String getUser();
+    String getUsername();
 
     String getPassword();
 
-    String getJdbcUrl();
+    String getUrl();
 
     String getDriverClass();
 

src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java

@@ -31,7 +31,7 @@ public interface DataSourceProxy {
 	
 	Driver getRawDriver();
 	
-	String getJdbcUrl();
+	String getUrl();
 	
 	String getRawJdbcUrl();
 	

src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java

@@ -100,19 +100,13 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
 		this.id = id;
 	}
 
-	@Override
-	public String getUrl() {
-		return this.config.getUrl();
-	}
-	
-
 	@Override
 	public String getName() {
 		return this.config.getName();
 	}
 	
 	@Override
-	public String getJdbcUrl() {
+	public String getUrl() {
 		return config.getUrl();
 	}