From e652dc36555436649f0da6c591a2250cadd17a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:02:54 +0800 Subject: [PATCH] refactor --- src/main/java/com/alibaba/druid/filter/FilterManager.java | 4 ++-- src/main/java/com/alibaba/druid/filter/stat/StatFilter.java | 4 ++-- src/main/java/com/alibaba/druid/hbase/HEngine.java | 4 ++-- src/main/java/com/alibaba/druid/http/HttpServer.java | 4 ++-- src/main/java/com/alibaba/druid/mock/MockDriver.java | 4 ++-- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++-- .../java/com/alibaba/druid/pool/DruidPooledConnection.java | 4 ++-- .../java/com/alibaba/druid/pool/DruidPooledStatement.java | 4 ++-- .../java/com/alibaba/druid/pool/PreparedStatementPool.java | 4 ++-- src/main/java/com/alibaba/druid/pool/ha/HADataSource.java | 4 ++-- src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java | 4 ++-- .../com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java | 4 ++-- .../java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java | 4 ++-- .../com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java | 4 ++-- .../druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java | 4 ++-- .../druid/pool/vendor/MSSQLValidConnectionChecker.java | 4 ++-- .../druid/pool/vendor/MySqlValidConnectionChecker.java | 4 ++-- .../druid/pool/vendor/OracleValidConnectionChecker.java | 4 ++-- .../java/com/alibaba/druid/pool/xa/XAPoolableConnection.java | 4 ++-- src/main/java/com/alibaba/druid/proxy/DruidDriver.java | 4 ++-- .../{ => support}/logging/JakartaCommonsLoggingImpl.java | 4 ++-- .../alibaba/druid/{ => support}/logging/Jdk14LoggingImpl.java | 2 +- .../java/com/alibaba/druid/{ => support}/logging/Log.java | 2 +- .../com/alibaba/druid/{ => support}/logging/Log4jImpl.java | 2 +- .../com/alibaba/druid/{ => support}/logging/LogFactory.java | 2 +- .../alibaba/druid/{ => support}/logging/NoLoggingImpl.java | 2 +- .../com/alibaba/druid/{ => support}/logging/Resources.java | 2 +- src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java | 4 ++-- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 4 ++-- src/main/java/com/alibaba/druid/wall/WallFilter.java | 4 ++-- .../java/com/alibaba/druid/wall/spi/WallVisitorUtils.java | 4 ++-- 31 files changed, 56 insertions(+), 56 deletions(-) rename src/main/java/com/alibaba/druid/{ => support}/logging/JakartaCommonsLoggingImpl.java (87%) rename src/main/java/com/alibaba/druid/{ => support}/logging/Jdk14LoggingImpl.java (90%) rename src/main/java/com/alibaba/druid/{ => support}/logging/Log.java (81%) rename src/main/java/com/alibaba/druid/{ => support}/logging/Log4jImpl.java (89%) rename src/main/java/com/alibaba/druid/{ => support}/logging/LogFactory.java (96%) rename src/main/java/com/alibaba/druid/{ => support}/logging/NoLoggingImpl.java (86%) rename src/main/java/com/alibaba/druid/{ => support}/logging/Resources.java (96%) diff --git a/src/main/java/com/alibaba/druid/filter/FilterManager.java b/src/main/java/com/alibaba/druid/filter/FilterManager.java index 7091bb649e..4065a07abb 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterManager.java +++ b/src/main/java/com/alibaba/druid/filter/FilterManager.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index f832cb6909..5e4efd0038 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/hbase/HEngine.java b/src/main/java/com/alibaba/druid/hbase/HEngine.java index aeb94cbcf2..01e793debb 100644 --- a/src/main/java/com/alibaba/druid/hbase/HEngine.java +++ b/src/main/java/com/alibaba/druid/hbase/HEngine.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/http/HttpServer.java b/src/main/java/com/alibaba/druid/http/HttpServer.java index 8c6a59c501..9c389395d9 100644 --- a/src/main/java/com/alibaba/druid/http/HttpServer.java +++ b/src/main/java/com/alibaba/druid/http/HttpServer.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/mock/MockDriver.java b/src/main/java/com/alibaba/druid/mock/MockDriver.java index 2e35d67f41..1398071f6d 100644 --- a/src/main/java/com/alibaba/druid/mock/MockDriver.java +++ b/src/main/java/com/alibaba/druid/mock/MockDriver.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 713f0b5285..60fb81364a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index dd39ccb42a..098277512b 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java index 6847c67202..1b7228a2de 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java index 655e1c793f..dfde0172aa 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java @@ -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; /** diff --git a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java index 71bf927815..2611e0702f 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java index dcccb6c6cf..5815b515c4 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSource.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java b/src/main/java/com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java index 5831bfc5dd..d37817b0a3 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java +++ b/src/main/java/com/alibaba/druid/pool/ha/balance/RoundRobinBlancer.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java index 8a6d0b6226..722f4f4341 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java index b00890dc57..b152e7b7e1 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java +++ b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarFailureDetecter.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java b/src/main/java/com/alibaba/druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java index 584b25f7c3..8ccce830e0 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java +++ b/src/main/java/com/alibaba/druid/pool/ha/valid/DefaultDataSourceFailureDetecter.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java index 24270056dc..149e20dfc4 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java @@ -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; /** diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java index 916fb89d73..6a1a127699 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java index d18a4b2dfe..1df1d4b5f5 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java b/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java index f1f50dcee2..13434c53b0 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java +++ b/src/main/java/com/alibaba/druid/pool/xa/XAPoolableConnection.java @@ -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 { diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java index c30285ab9a..30a42114ee 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/logging/JakartaCommonsLoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java similarity index 87% rename from src/main/java/com/alibaba/druid/logging/JakartaCommonsLoggingImpl.java rename to src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java index c8c9b0cd87..c09c9b83a3 100644 --- a/src/main/java/com/alibaba/druid/logging/JakartaCommonsLoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/logging/Jdk14LoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java similarity index 90% rename from src/main/java/com/alibaba/druid/logging/Jdk14LoggingImpl.java rename to src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java index bdf75ad07c..70bdcd042c 100644 --- a/src/main/java/com/alibaba/druid/logging/Jdk14LoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/logging/Log.java b/src/main/java/com/alibaba/druid/support/logging/Log.java similarity index 81% rename from src/main/java/com/alibaba/druid/logging/Log.java rename to src/main/java/com/alibaba/druid/support/logging/Log.java index 305152407d..fe59eaa116 100644 --- a/src/main/java/com/alibaba/druid/logging/Log.java +++ b/src/main/java/com/alibaba/druid/support/logging/Log.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.logging; +package com.alibaba.druid.support.logging; public interface Log { diff --git a/src/main/java/com/alibaba/druid/logging/Log4jImpl.java b/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java similarity index 89% rename from src/main/java/com/alibaba/druid/logging/Log4jImpl.java rename to src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java index c6b6161a4b..f09643eea8 100644 --- a/src/main/java/com/alibaba/druid/logging/Log4jImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.logging; +package com.alibaba.druid.support.logging; import org.apache.log4j.Logger; diff --git a/src/main/java/com/alibaba/druid/logging/LogFactory.java b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java similarity index 96% rename from src/main/java/com/alibaba/druid/logging/LogFactory.java rename to src/main/java/com/alibaba/druid/support/logging/LogFactory.java index 8cfda8839d..6cf43be589 100644 --- a/src/main/java/com/alibaba/druid/logging/LogFactory.java +++ b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.logging; +package com.alibaba.druid.support.logging; import java.lang.reflect.Constructor; diff --git a/src/main/java/com/alibaba/druid/logging/NoLoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java similarity index 86% rename from src/main/java/com/alibaba/druid/logging/NoLoggingImpl.java rename to src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java index 5e597a49d5..89688f14dd 100644 --- a/src/main/java/com/alibaba/druid/logging/NoLoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.logging; +package com.alibaba.druid.support.logging; public class NoLoggingImpl implements Log { diff --git a/src/main/java/com/alibaba/druid/logging/Resources.java b/src/main/java/com/alibaba/druid/support/logging/Resources.java similarity index 96% rename from src/main/java/com/alibaba/druid/logging/Resources.java rename to src/main/java/com/alibaba/druid/support/logging/Resources.java index c603d61590..d4240e7b67 100644 --- a/src/main/java/com/alibaba/druid/logging/Resources.java +++ b/src/main/java/com/alibaba/druid/support/logging/Resources.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.logging; +package com.alibaba.druid.support.logging; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java b/src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java index 9aaefa82b7..0863f648bf 100644 --- a/src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java +++ b/src/main/java/com/alibaba/druid/util/DruidLoaderUtils.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 1d6babc983..96182a5523 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -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 diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index ffcfdc0d7e..731020918e 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index e25a9b37e2..26540a3a48 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -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;