Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
温少
2012-05-21 16:02:54 +08:00
parent 0658c1d0a1
commit e652dc3655
31 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/FilterManager.java
+2 -2
View File
@@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
public class FilterManager {
src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+2 -2
View File
@@ -33,8 +33,6 @@ import javax.management.openmbean.TabularData;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterChain;
import com.alibaba.druid.filter.FilterEventAdapter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
@@ -51,6 +49,8 @@ import com.alibaba.druid.stat.JdbcSqlStat;
import com.alibaba.druid.stat.JdbcStatContext;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.stat.JdbcStatementStat;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
src/main/java/com/alibaba/druid/hbase/HEngine.java
+2 -2
View File
@@ -11,8 +11,8 @@ import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.HTablePool;
import com.alibaba.druid.hbase.mapping.HMappingTable;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class HEngine {
src/main/java/com/alibaba/druid/http/HttpServer.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.thread.QueuedThreadPool;
import org.mortbay.util.MultiException;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class HttpServer {
src/main/java/com/alibaba/druid/mock/MockDriver.java
+2 -2
View File
@@ -36,10 +36,10 @@ import java.util.logging.Logger;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.mock.handler.MockExecuteHandler;
import com.alibaba.druid.mock.handler.MySqlMockExecuteHandlerImpl;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class MockDriver implements Driver, MockDriverMBean {
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+2 -2
View File
@@ -40,8 +40,6 @@ import javax.sql.ConnectionEventListener;
import com.alibaba.druid.TransactionTimeoutException;
import com.alibaba.druid.VERSION;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.mock.MockDriver;
import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
import com.alibaba.druid.pool.vendor.InformixExceptionSorter;
@@ -57,6 +55,8 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
import com.alibaba.druid.proxy.jdbc.TransactionInfo;
import com.alibaba.druid.stat.DruidDataSourceStatManager;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.JdbcUtils;
src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+2 -2
View File
@@ -39,12 +39,12 @@ import javax.sql.ConnectionEvent;
import javax.sql.ConnectionEventListener;
import javax.sql.StatementEventListener;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
import com.alibaba.druid.pool.PreparedStatementPool.MethodType;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.proxy.jdbc.TransactionInfo;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
+2 -2
View File
@@ -23,9 +23,9 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java
+2 -2
View File
@@ -22,9 +22,9 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.OracleUtils;
/**
src/main/java/com/alibaba/druid/pool/ha/HADataSource.java
+2 -2
View File
@@ -2,10 +2,10 @@ package com.alibaba.druid.pool.ha;
import javax.sql.DataSource;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.ManagedDataSource;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class HADataSource extends MultiDataSource implements HADataSourceMBean, ManagedDataSource, DataSource {
src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java
+2 -2
View File
@@ -21,8 +21,6 @@ import java.util.concurrent.locks.ReentrantLock;
import javax.management.ObjectName;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DataSourceAdapter;
import com.alibaba.druid.pool.ha.balance.Balancer;
import com.alibaba.druid.pool.ha.balance.WeightBalancer;
@@ -31,6 +29,8 @@ import com.alibaba.druid.pool.ha.valid.DataSourceFailureDetecter;
import com.alibaba.druid.pool.ha.valid.DefaultDataSourceFailureDetecter;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
public class MultiDataSource extends DataSourceAdapter implements MultiDataSourceMBean, DataSourceProxy {
src/main/java/com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java
+2 -2
View File
@@ -3,13 +3,13 @@ package com.alibaba.druid.pool.ha.balance;
import java.sql.SQLException;
import java.util.concurrent.atomic.AtomicInteger;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.ha.DataSourceChangedEvent;
import com.alibaba.druid.pool.ha.DataSourceHolder;
import com.alibaba.druid.pool.ha.MultiConnectionHolder;
import com.alibaba.druid.pool.ha.MultiDataSource;
import com.alibaba.druid.pool.ha.MultiDataSourceConnection;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class RoundRobinBlancer extends AbstractBalancer {
src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java
+2 -2
View File
@@ -5,11 +5,11 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.ha.DataSourceHolder;
import com.alibaba.druid.pool.ha.MultiDataSource;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
public class CobarDataSource extends MultiDataSource {
src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java
+2 -2
View File
@@ -4,10 +4,10 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.ha.valid.DefaultDataSourceFailureDetecter;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
public class CobarFailureDetecter extends DefaultDataSourceFailureDetecter {
src/main/java/com/alibaba/druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java
+2 -2
View File
@@ -3,9 +3,9 @@ package com.alibaba.druid.pool.ha.valid;
import java.sql.Connection;
import java.sql.Statement;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
public class DefaultDataSourceFailureDetecter implements DataSourceFailureDetecter {
src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.ValidConnectionChecker;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
/**
src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java
Vendored
+2 -2
View File
@@ -7,11 +7,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.pool.ValidConnectionChecker;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.DruidLoaderUtils;
import com.alibaba.druid.util.JdbcUtils;
src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java
Vendored
+2 -2
View File
@@ -28,11 +28,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.pool.ValidConnectionChecker;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.DruidLoaderUtils;
import com.alibaba.druid.util.JdbcUtils;
src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java
+2 -2
View File
@@ -9,10 +9,10 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.ConnectionHolder;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
public class XAPoolableConnection extends DruidPooledConnection implements XAResource {
src/main/java/com/alibaba/druid/proxy/DruidDriver.java
+2 -2
View File
@@ -36,14 +36,14 @@ import javax.management.ObjectName;
import com.alibaba.druid.VERSION;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
import com.alibaba.druid.proxy.config.DruidFilterConfigLoader;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.DruidLoaderUtils;
import com.alibaba.druid.util.JMXUtils;
import com.alibaba.druid.util.JdbcUtils;
src/main/java/com/alibaba/druid/logging/JakartaCommonsLoggingImpl.java → src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class JakartaCommonsLoggingImpl implements com.alibaba.druid.logging.Log {
public class JakartaCommonsLoggingImpl implements com.alibaba.druid.support.logging.Log {
private Log log;
src/main/java/com/alibaba/druid/logging/Jdk14LoggingImpl.java → src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
import java.util.logging.Level;
import java.util.logging.Logger;
src/main/java/com/alibaba/druid/logging/Log.java → src/main/java/com/alibaba/druid/support/logging/Log.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
public interface Log {
src/main/java/com/alibaba/druid/logging/Log4jImpl.java → src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
import org.apache.log4j.Logger;
src/main/java/com/alibaba/druid/logging/LogFactory.java → src/main/java/com/alibaba/druid/support/logging/LogFactory.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
import java.lang.reflect.Constructor;
src/main/java/com/alibaba/druid/logging/NoLoggingImpl.java → src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
public class NoLoggingImpl implements Log {
src/main/java/com/alibaba/druid/logging/Resources.java → src/main/java/com/alibaba/druid/support/logging/Resources.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.logging;
package com.alibaba.druid.support.logging;
import java.io.File;
import java.io.IOException;
src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java
+2 -2
View File
@@ -21,9 +21,9 @@ import java.util.List;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterManager;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
/**
* druid loader utils
src/main/java/com/alibaba/druid/util/JdbcUtils.java
+2 -2
View File
@@ -37,8 +37,8 @@ import java.util.Properties;
import javax.sql.DataSource;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
/**
* @author wenshao<szujobs@hotmail.com>
src/main/java/com/alibaba/druid/wall/WallFilter.java
+2 -2
View File
@@ -8,14 +8,14 @@ import java.util.Set;
import com.alibaba.druid.DruidRuntimeException;
import com.alibaba.druid.filter.FilterAdapter;
import com.alibaba.druid.filter.FilterChain;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.wall.spi.MySqlWallProvider;
import com.alibaba.druid.wall.spi.OracleWallProvider;
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+2 -2
View File
@@ -9,8 +9,6 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Set;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
@@ -42,6 +40,8 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr;
import com.alibaba.druid.sql.visitor.ExportParameterVisitor;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.wall.WallVisitor;
import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation;