Author: cbegin Date: Sat Jun 25 00:00:11 2005 New Revision: 201729 URL: http://svn.apache.org/viewcvs?rev=201729&view=rev Log: Removed dependency on Commons Logging, will autodetect and use Commons Logging, Log4J, JDK 1.4 or no logging
Added: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/logging/ Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ConnectionLogProxy.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Stopwatch.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jdbc/JdbcDaoTransaction.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jta/JtaDaoTransaction.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original) +++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Sat Jun 25 00:00:11 2005 @@ -10,6 +10,7 @@ o Fixed IBATIS-152, 149, 116 null result sets now handled properly by JDBC logging classes (thanks Sven) o Fixed IBATIS-146 consumes additional result sets before retrieving output params (JTDS fix) o Fixed IBATIS-130 parameter maps don't allow for complete TypeHandler implementations + o Removed dependency on Commons Logging, will autodetect and use Commons Logging, Log4J, JDK 1.4 or no logging ------------------------------ 2.1.0 - May 16, 2004 Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java Sat Jun 25 00:00:11 2005 @@ -18,8 +18,8 @@ import com.ibatis.common.beans.ClassInfo; import com.ibatis.common.exception.NestedRuntimeException; import com.ibatis.common.resources.Resources; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.LogFactory; +import com.ibatis.common.logging.Log; import javax.sql.DataSource; import java.io.PrintWriter; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ConnectionLogProxy.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ConnectionLogProxy.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ConnectionLogProxy.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ConnectionLogProxy.java Sat Jun 25 00:00:11 2005 @@ -16,8 +16,8 @@ package com.ibatis.common.jdbc.logging; import com.ibatis.common.beans.ClassInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java Sat Jun 25 00:00:11 2005 @@ -16,8 +16,8 @@ package com.ibatis.common.jdbc.logging; import com.ibatis.common.beans.ClassInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java Sat Jun 25 00:00:11 2005 @@ -16,8 +16,8 @@ package com.ibatis.common.jdbc.logging; import com.ibatis.common.beans.ClassInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java Sat Jun 25 00:00:11 2005 @@ -16,8 +16,8 @@ package com.ibatis.common.jdbc.logging; import com.ibatis.common.beans.ClassInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Stopwatch.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Stopwatch.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Stopwatch.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Stopwatch.java Sat Jun 25 00:00:11 2005 @@ -15,8 +15,8 @@ */ package com.ibatis.common.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import java.util.HashMap; import java.util.Iterator; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jdbc/JdbcDaoTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jdbc/JdbcDaoTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jdbc/JdbcDaoTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jdbc/JdbcDaoTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,10 +16,10 @@ package com.ibatis.dao.engine.transaction.jdbc; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.dao.client.DaoException; import com.ibatis.dao.engine.transaction.ConnectionDaoTransaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import java.sql.Connection; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jta/JtaDaoTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jta/JtaDaoTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jta/JtaDaoTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/transaction/jta/JtaDaoTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,10 +16,10 @@ package com.ibatis.dao.engine.transaction.jta; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.dao.client.DaoException; import com.ibatis.dao.engine.transaction.ConnectionDaoTransaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import javax.transaction.Status; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java Sat Jun 25 00:00:11 2005 @@ -16,14 +16,14 @@ package com.ibatis.sqlmap.engine.impl; import com.ibatis.common.util.PaginatedList; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.sqlmap.client.SqlMapException; import com.ibatis.sqlmap.client.SqlMapSession; import com.ibatis.sqlmap.client.event.RowHandler; import com.ibatis.sqlmap.engine.execution.SqlExecutor; import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement; import com.ibatis.sqlmap.engine.binding.MapperProxy; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import java.sql.Connection; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapSessionImpl.java Sat Jun 25 00:00:11 2005 @@ -24,8 +24,6 @@ import com.ibatis.sqlmap.engine.scope.SessionScope; import com.ibatis.sqlmap.engine.transaction.Transaction; import com.ibatis.sqlmap.engine.transaction.TransactionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import java.sql.Connection; @@ -37,8 +35,6 @@ * Implementation of SqlMapSession */ public class SqlMapSessionImpl implements SqlMapSession { - - private static final Log log = LogFactory.getLog(SqlMapSessionImpl.class); protected SqlMapExecutorDelegate delegate; protected SessionScope session; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,11 +16,11 @@ package com.ibatis.sqlmap.engine.transaction.external; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.sqlmap.engine.transaction.IsolationLevel; import com.ibatis.sqlmap.engine.transaction.Transaction; import com.ibatis.sqlmap.engine.transaction.TransactionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import java.sql.Connection; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,11 +16,11 @@ package com.ibatis.sqlmap.engine.transaction.jdbc; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.sqlmap.engine.transaction.IsolationLevel; import com.ibatis.sqlmap.engine.transaction.Transaction; import com.ibatis.sqlmap.engine.transaction.TransactionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import java.sql.Connection; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,11 +16,11 @@ package com.ibatis.sqlmap.engine.transaction.jta; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.sqlmap.engine.transaction.IsolationLevel; import com.ibatis.sqlmap.engine.transaction.Transaction; import com.ibatis.sqlmap.engine.transaction.TransactionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.sql.DataSource; import javax.transaction.Status; Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java?rev=201729&r1=201728&r2=201729&view=diff ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java Sat Jun 25 00:00:11 2005 @@ -16,10 +16,10 @@ package com.ibatis.sqlmap.engine.transaction.user; import com.ibatis.common.jdbc.logging.ConnectionLogProxy; +import com.ibatis.common.logging.Log; +import com.ibatis.common.logging.LogFactory; import com.ibatis.sqlmap.engine.transaction.Transaction; import com.ibatis.sqlmap.engine.transaction.TransactionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.sql.Connection; import java.sql.SQLException;