From f0755725c91b67f6cb86c97c23aa7e0b30d03d8d Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Fri, 3 Aug 2007 04:09:17 +0000
Subject: [PATCH] HHH-2704 : migrate to maven (testsuite) HHH-2696 : migrate to
 slf4j

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@12891 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../java/org/hibernate/cache/EhCache.java     |   7 +-
 .../org/hibernate/cache/EhCacheProvider.java  |   6 +-
 .../hibernate/cache/OptimisticTreeCache.java  |   6 +-
 .../cache/OptimisticTreeCacheProvider.java    |   6 +-
 .../java/org/hibernate/cache/TreeCache.java   |   6 +-
 .../hibernate/cache/TreeCacheProvider.java    |   6 +-
 .../InvalidationCacheInstanceManager.java     |   6 +-
 .../cache/jbc2/collection/ReadOnlyAccess.java |   6 +-
 .../jbc2/collection/TransactionalAccess.java  |   6 +-
 .../cache/jbc2/entity/ReadOnlyAccess.java     |   6 +-
 .../jbc2/entity/TransactionalAccess.java      |   6 +-
 .../connection/C3P0ConnectionProvider.java    |  10 +-
 .../connection/ProxoolConnectionProvider.java |   6 +-
 core/pom.xml                                  |   4 -
 core/src/main/antlr/hql-sql.g                 |   6 +-
 core/src/main/antlr/sql-gen.g                 |   6 +-
 .../java/org/hibernate/AssertionFailure.java  |   6 +-
 .../LazyInitializationException.java          |   4 +-
 .../bytecode/cglib/BytecodeProviderImpl.java  |   6 +-
 .../bytecode/cglib/CglibClassTransformer.java |   6 +-
 .../javassist/BytecodeProviderImpl.java       |   6 +-
 .../javassist/JavassistClassTransformer.java  |   6 +-
 .../cache/AbstractJndiBoundCacheProvider.java |   6 +-
 .../cache/NonstrictReadWriteCache.java        |   6 +-
 .../org/hibernate/cache/ReadOnlyCache.java    |   6 +-
 .../org/hibernate/cache/ReadWriteCache.java   |   6 +-
 .../hibernate/cache/StandardQueryCache.java   |   6 +-
 .../hibernate/cache/TransactionalCache.java   |   6 +-
 .../cache/UpdateTimestampsCache.java          |   6 +-
 .../impl/bridge/CollectionRegionAdapter.java  |   6 +-
 .../impl/bridge/EntityRegionAdapter.java      |   6 +-
 .../RegionFactoryCacheProviderBridge.java     |   6 +-
 .../hibernate/cfg/CollectionSecondPass.java   |   6 +-
 .../java/org/hibernate/cfg/Configuration.java |   6 +-
 .../java/org/hibernate/cfg/Environment.java   |   6 +-
 .../java/org/hibernate/cfg/HbmBinder.java     |   6 +-
 .../main/java/org/hibernate/cfg/Mappings.java |   6 +-
 .../cfg/NamedSQLQuerySecondPass.java          |   6 +-
 .../org/hibernate/cfg/SettingsFactory.java    |   6 +-
 .../collection/PersistentArrayHolder.java     |   6 +-
 .../connection/ConnectionProviderFactory.java |  22 +-
 .../DatasourceConnectionProvider.java         |  26 +-
 .../DriverManagerConnectionProvider.java      |  18 +-
 .../UserSuppliedConnectionProvider.java       |   5 +-
 .../hibernate/context/JTASessionContext.java  |   6 +-
 .../context/ThreadLocalSessionContext.java    |   6 +-
 .../java/org/hibernate/dialect/Dialect.java   |   6 +-
 .../org/hibernate/dialect/HSQLDialect.java    |   6 +-
 .../org/hibernate/dialect/Oracle9Dialect.java |   6 +-
 .../org/hibernate/dialect/OracleDialect.java  |   6 +-
 .../hibernate/dialect/RDMSOS2200Dialect.java  |   6 +-
 .../dialect/lock/UpdateLockingStrategy.java   |   6 +-
 .../org/hibernate/engine/ActionQueue.java     |   6 +-
 .../java/org/hibernate/engine/Cascade.java    |   6 +-
 .../org/hibernate/engine/CascadingAction.java |   6 +-
 .../org/hibernate/engine/CollectionEntry.java |   6 +-
 .../org/hibernate/engine/Collections.java     |   6 +-
 .../org/hibernate/engine/IdentifierValue.java |   6 +-
 .../org/hibernate/engine/ParameterBinder.java |   6 +-
 .../org/hibernate/engine/QueryParameters.java |   6 +-
 .../engine/StatefulPersistenceContext.java    |   8 +-
 .../org/hibernate/engine/TwoPhaseLoad.java    |   6 +-
 .../org/hibernate/engine/VersionValue.java    |   6 +-
 .../java/org/hibernate/engine/Versioning.java |   6 +-
 .../engine/loading/CollectionLoadContext.java |   6 +-
 .../engine/loading/EntityLoadContext.java     |   6 +-
 .../engine/loading/LoadContexts.java          |   6 +-
 .../hibernate/engine/query/HQLQueryPlan.java  |   6 +-
 .../engine/query/NativeSQLQueryPlan.java      |   6 +-
 .../engine/query/QueryPlanCache.java          |   6 +-
 .../engine/transaction/Isolater.java          |   6 +-
 .../def/AbstractFlushingEventListener.java    |   6 +-
 .../def/AbstractLockUpgradeEventListener.java |   6 +-
 .../def/AbstractReassociateEventListener.java |   6 +-
 .../event/def/AbstractSaveEventListener.java  |   6 +-
 .../def/DefaultAutoFlushEventListener.java    |   6 +-
 .../event/def/DefaultDeleteEventListener.java |   6 +-
 .../def/DefaultDirtyCheckEventListener.java   |   6 +-
 .../event/def/DefaultEvictEventListener.java  |   6 +-
 .../def/DefaultFlushEntityEventListener.java  |   6 +-
 ...aultInitializeCollectionEventListener.java |   6 +-
 .../event/def/DefaultLoadEventListener.java   |   6 +-
 .../event/def/DefaultMergeEventListener.java  |   6 +-
 .../def/DefaultPersistEventListener.java      |   6 +-
 .../def/DefaultRefreshEventListener.java      |   6 +-
 .../def/DefaultReplicateEventListener.java    |   6 +-
 .../def/DefaultSaveOrUpdateEventListener.java |   6 +-
 .../org/hibernate/event/def/EvictVisitor.java |   6 +-
 .../hibernate/event/def/ReattachVisitor.java  |   6 +-
 .../org/hibernate/event/def/WrapVisitor.java  |   6 +-
 .../SQLExceptionConverterFactory.java         |   6 +-
 .../java/org/hibernate/hql/QuerySplitter.java |   6 +-
 .../hql/ast/ASTQueryTranslatorFactory.java    |   6 +-
 .../org/hibernate/hql/ast/ErrorCounter.java   |  10 +-
 .../java/org/hibernate/hql/ast/HqlParser.java |   6 +-
 .../org/hibernate/hql/ast/HqlSqlWalker.java   |   6 +-
 .../hql/ast/QueryTranslatorImpl.java          |   8 +-
 .../ast/exec/AbstractStatementExecutor.java   |   6 +-
 .../hibernate/hql/ast/exec/BasicExecutor.java |   6 +-
 .../ast/exec/MultiTableDeleteExecutor.java    |   6 +-
 .../ast/exec/MultiTableUpdateExecutor.java    |   6 +-
 .../tree/AbstractRestrictableStatement.java   |   4 +-
 .../hql/ast/tree/DeleteStatement.java         |   8 +-
 .../org/hibernate/hql/ast/tree/DotNode.java   |   6 +-
 .../hibernate/hql/ast/tree/FromClause.java    |   6 +-
 .../hibernate/hql/ast/tree/FromElement.java   |   6 +-
 .../hql/ast/tree/FromElementFactory.java      |   6 +-
 .../hql/ast/tree/FromElementType.java         |   6 +-
 .../hql/ast/tree/FromReferenceNode.java       |   6 +-
 .../org/hibernate/hql/ast/tree/IndexNode.java |   6 +-
 .../hibernate/hql/ast/tree/MethodNode.java    |   6 +-
 .../org/hibernate/hql/ast/tree/QueryNode.java |   8 +-
 .../hql/ast/tree/UpdateStatement.java         |   8 +-
 .../hibernate/hql/ast/util/JoinProcessor.java |   6 +-
 .../hql/ast/util/LiteralProcessor.java        |   6 +-
 .../hibernate/hql/ast/util/PathHelper.java    |   6 +-
 .../hql/ast/util/SyntheticAndFactory.java     |   6 +-
 .../hql/classic/QueryTranslatorImpl.java      |   6 +-
 .../java/org/hibernate/id/GUIDGenerator.java  |   6 +-
 .../id/IdentifierGeneratorFactory.java        |   6 +-
 .../org/hibernate/id/IncrementGenerator.java  |   6 +-
 .../id/MultipleHiLoPerTableGenerator.java     |   6 +-
 .../id/PersistentIdentifierGenerator.java     |   6 +-
 .../org/hibernate/id/SequenceGenerator.java   |   6 +-
 .../hibernate/id/SequenceHiLoGenerator.java   |   6 +-
 .../id/SequenceIdentityGenerator.java         |   6 +-
 .../java/org/hibernate/id/TableGenerator.java |   6 +-
 .../org/hibernate/id/TableHiLoGenerator.java  |   6 +-
 .../id/enhanced/OptimizerFactory.java         |   6 +-
 .../id/enhanced/SequenceStructure.java        |   6 +-
 .../id/enhanced/SequenceStyleGenerator.java   |   6 +-
 .../hibernate/id/enhanced/TableGenerator.java |   6 +-
 .../hibernate/id/enhanced/TableStructure.java |   8 +-
 .../impl/AbstractScrollableResults.java       |   6 +-
 .../java/org/hibernate/impl/IteratorImpl.java |   6 +-
 .../hibernate/impl/SessionFactoryImpl.java    |   6 +-
 .../impl/SessionFactoryObjectFactory.java     |  12 +-
 .../java/org/hibernate/impl/SessionImpl.java  |   6 +-
 .../hibernate/impl/StatelessSessionImpl.java  |   6 +-
 .../org/hibernate/jdbc/AbstractBatcher.java   |   8 +-
 .../org/hibernate/jdbc/ConnectionManager.java |   6 +-
 .../java/org/hibernate/jdbc/Expectations.java |   6 +-
 .../java/org/hibernate/jdbc/JDBCContext.java  |   6 +-
 .../java/org/hibernate/loader/Loader.java     |   6 +-
 .../collection/BasicCollectionLoader.java     |   6 +-
 .../loader/collection/OneToManyLoader.java    |   6 +-
 .../loader/custom/sql/SQLCustomQuery.java     |   6 +-
 .../custom/sql/SQLQueryReturnProcessor.java   |   6 +-
 .../loader/entity/AbstractEntityLoader.java   |   6 +-
 .../entity/CollectionElementLoader.java       |   6 +-
 .../java/org/hibernate/mapping/RootClass.java |   6 +-
 .../AbstractCollectionPersister.java          |   6 +-
 .../NamedQueryCollectionInitializer.java      |   6 +-
 .../entity/AbstractEntityPersister.java       |   6 +-
 .../persister/entity/NamedQueryLoader.java    |   6 +-
 .../java/org/hibernate/pretty/Printer.java    |   6 +-
 .../property/BasicPropertyAccessor.java       |   6 +-
 .../pojo/cglib/CGLIBLazyInitializer.java      |   4 +-
 .../javassist/JavassistLazyInitializer.java   |   6 +-
 .../hibernate/secure/JACCConfiguration.java   |   6 +-
 .../org/hibernate/stat/StatisticsImpl.java    |   6 +-
 .../tool/hbm2ddl/DatabaseMetadata.java        |   6 +-
 .../hibernate/tool/hbm2ddl/SchemaExport.java  |   6 +-
 .../hibernate/tool/hbm2ddl/SchemaUpdate.java  |   6 +-
 .../tool/hbm2ddl/SchemaValidator.java         |   6 +-
 .../hibernate/tool/hbm2ddl/TableMetadata.java |   6 +-
 .../hibernate/transaction/CMTTransaction.java |   6 +-
 .../transaction/CacheSynchronization.java     |   6 +-
 .../transaction/JDBCTransaction.java          |   6 +-
 .../hibernate/transaction/JTATransaction.java |   6 +-
 .../transaction/JTATransactionFactory.java    |   6 +-
 .../TransactionFactoryFactory.java            |   6 +-
 .../TransactionManagerLookupFactory.java      |   6 +-
 .../WebSphereTransactionManagerLookup.java    |   6 +-
 .../DistinctRootEntityResultTransformer.java  |   6 +-
 .../org/hibernate/tuple/PojoInstantiator.java |   6 +-
 .../tuple/entity/Dom4jEntityTuplizer.java     |   6 +-
 .../entity/DynamicMapEntityTuplizer.java      |   6 +-
 .../tuple/entity/EntityMetamodel.java         |   6 +-
 .../tuple/entity/PojoEntityTuplizer.java      |   6 +-
 .../org/hibernate/type/DbTimestampType.java   |   6 +-
 .../java/org/hibernate/type/NullableType.java |  12 +-
 .../java/org/hibernate/util/ConfigHelper.java |   8 +-
 .../org/hibernate/util/DTDEntityResolver.java |   6 +-
 .../hibernate/util/JDBCExceptionReporter.java |   6 +-
 .../java/org/hibernate/util/NamingHelper.java |   6 +-
 .../hibernate/util/SerializationHelper.java   |   6 +-
 .../java/org/hibernate/util/XMLHelper.java    |   6 +-
 .../src/main/docbook/modules/quickstart.xml   |   2 +-
 .../src/main/docbook/modules/quickstart.xml   |   2 +-
 .../src/main/docbook/modules/quickstart.xml   |   2 +-
 .../tutorial/web/SessionInterceptor.java      |   6 +-
 jmx/pom.xml                                   |  15 +-
 .../org/hibernate/jmx/HibernateService.java   |   6 +-
 .../org/hibernate/jmx/SessionFactoryStub.java |   6 +-
 .../org/hibernate/jmx/StatisticsService.java  |   6 +-
 pom.xml                                       |   3 +-
 testing/pom.xml                               |   1 +
 .../java/org/hibernate/junit/SkipLog.java     |   6 +-
 .../org/hibernate/junit/UnitTestCase.java     |   6 +-
 .../junit/functional/FunctionalTestCase.java  |   6 +-
 .../FunctionalTestClassTestSuite.java         |   6 +-
 testsuite/pom.xml                             | 237 ++++++++----------
 .../cache/SQLFunctionsInterSystemsTest.java   |   6 +-
 .../test/filter/DynamicFilterTest.java        |   6 +-
 .../test/hql/ASTParserLoadingTest.java        |   6 +-
 .../test/hql/BulkManipulationTest.java        |   6 +-
 .../test/jpa/cascade/CascadeTest.java         |   6 +-
 .../test/legacy/SQLFunctionsTest.java         |   6 +-
 .../DefaultValueIntegerType.java              |   6 +-
 .../src/test/profile/hsqldb/hsqldb-env.xml    |  21 --
 .../src/test/resources/hibernate.properties   |  30 +++
 testsuite/src/test/resources/log4j.properties |   2 +-
 213 files changed, 803 insertions(+), 806 deletions(-)
 delete mode 100644 testsuite/src/test/profile/hsqldb/hsqldb-env.xml
 create mode 100644 testsuite/src/test/resources/hibernate.properties

diff --git a/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java b/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java
index 5729211a9f..98dbf4873e 100644
--- a/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java
+++ b/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java
@@ -16,15 +16,14 @@
  */
 package org.hibernate.cache;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * EHCache plugin for Hibernate
@@ -39,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Emmanuel Bernard
  */
 public class EhCache implements Cache {
-	private static final Log log = LogFactory.getLog( EhCache.class );
+	private static final Logger log = LoggerFactory.getLogger( EhCache.class );
 
 	private static final int SIXTY_THOUSAND_MS = 60000;
 
diff --git a/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java b/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java
index 1850bdf2da..e15a715925 100644
--- a/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java
+++ b/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java
@@ -20,8 +20,8 @@ import java.util.Properties;
 import java.net.URL;
 
 import net.sf.ehcache.CacheManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.cfg.Environment;
 import org.hibernate.util.StringHelper;
 import org.hibernate.util.ConfigHelper;
@@ -62,7 +62,7 @@ import org.hibernate.util.ConfigHelper;
  */
 public class EhCacheProvider implements CacheProvider {
 
-    private static final Log log = LogFactory.getLog(EhCacheProvider.class);
+    private static final Logger log = LoggerFactory.getLogger(EhCacheProvider.class);
 
 	private CacheManager manager;
 
diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCache.java b/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCache.java
index f7c3e26db1..5a1a97ee04 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCache.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCache.java
@@ -8,8 +8,8 @@ import java.util.Set;
 import java.util.Comparator;
 
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.optimistic.DataVersion;
 import org.jboss.cache.config.Option;
@@ -27,7 +27,7 @@ public class OptimisticTreeCache implements OptimisticCache, TransactionAwareCac
 
 	// todo : eventually merge this with TreeCache and just add optional opt-lock support there.
 
-	private static final Log log = LogFactory.getLog( OptimisticTreeCache.class);
+	private static final Logger log = LoggerFactory.getLogger( OptimisticTreeCache.class);
 
 	private static final String ITEM = "item";
 
diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCacheProvider.java b/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCacheProvider.java
index 8ef04445b5..a2095006f2 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCacheProvider.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/OptimisticTreeCacheProvider.java
@@ -4,8 +4,8 @@ package org.hibernate.cache;
 import java.util.Properties;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.cfg.Environment;
 import org.hibernate.transaction.TransactionManagerLookup;
 import org.hibernate.transaction.TransactionManagerLookupFactory;
@@ -32,7 +32,7 @@ public class OptimisticTreeCacheProvider implements CacheProvider {
 	public static final String DEFAULT_CONFIG = "treecache.xml";
 
 	private static final String NODE_LOCKING_SCHEME = "OPTIMISTIC";
-	private static final Log log = LogFactory.getLog( OptimisticTreeCacheProvider.class );
+	private static final Logger log = LoggerFactory.getLogger( OptimisticTreeCacheProvider.class );
 
 	private org.jboss.cache.TreeCache cache;
 
diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCache.java b/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCache.java
index 9ed9cb3e51..57920bf00b 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCache.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCache.java
@@ -10,8 +10,8 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.lock.TimeoutException;
 
@@ -22,7 +22,7 @@ import org.jboss.cache.lock.TimeoutException;
  */
 public class TreeCache implements Cache, TransactionAwareCache {
 	
-	private static final Log log = LogFactory.getLog(TreeCache.class);
+	private static final Logger log = LoggerFactory.getLogger(TreeCache.class);
 
 	private static final String ITEM = "item";
 
diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCacheProvider.java b/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCacheProvider.java
index 7e68f08d6e..8ea8d2ec30 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCacheProvider.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/TreeCacheProvider.java
@@ -4,8 +4,8 @@ package org.hibernate.cache;
 import java.util.Properties;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.transaction.TransactionManagerLookup;
 import org.hibernate.transaction.TransactionManagerLookupFactory;
 import org.hibernate.cfg.Environment;
@@ -25,7 +25,7 @@ public class TreeCacheProvider implements CacheProvider {
 	public static final String CONFIG_RESOURCE = "hibernate.cache.tree_cache.config";
 	public static final String DEFAULT_CONFIG = "treecache.xml";
 
-	private static final Log log = LogFactory.getLog( TreeCacheProvider.class );
+	private static final Logger log = LoggerFactory.getLogger( TreeCacheProvider.class );
 
 	private org.jboss.cache.TreeCache cache;
 	private TransactionManager transactionManager;
diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/InvalidationCacheInstanceManager.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/InvalidationCacheInstanceManager.java
index d9f628117d..2b3da525be 100644
--- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/InvalidationCacheInstanceManager.java
+++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/InvalidationCacheInstanceManager.java
@@ -18,8 +18,8 @@ package org.hibernate.cache.jbc2.builder;
 import java.util.Properties;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jboss.cache.Cache;
 import org.jboss.cache.DefaultCacheFactory;
 
@@ -42,7 +42,7 @@ public class InvalidationCacheInstanceManager implements CacheInstanceManager {
 	public static final String CACHE_RESOURCE_PROP = "hibernate.cache.region.jbc2.cfg.invalidation";
 	public static final String DEFAULT_CACHE_RESOURCE = "treecache.xml";
 
-	private static final Log log = LogFactory.getLog( InvalidationCacheInstanceManager.class );
+	private static final Logger log = LoggerFactory.getLogger( InvalidationCacheInstanceManager.class );
 
 	private final Cache cache;
 
diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java
index 5ee9daca31..296529ac86 100644
--- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java
+++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java
@@ -15,8 +15,8 @@
  */
 package org.hibernate.cache.jbc2.collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 import org.hibernate.cache.CacheException;
@@ -30,7 +30,7 @@ import org.hibernate.cache.CacheException;
  * @author Steve Ebersole
  */
 public class ReadOnlyAccess extends TransactionalAccess {
-	private static final Log log = LogFactory.getLog( ReadOnlyAccess.class );
+	private static final Logger log = LoggerFactory.getLogger( ReadOnlyAccess.class );
 
 	public ReadOnlyAccess(CollectionRegionImpl region) {
 		super( region );
diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java
index c98f667639..08ca06cdfb 100644
--- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java
+++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java
@@ -15,8 +15,8 @@
  */
 package org.hibernate.cache.jbc2.collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
@@ -29,7 +29,7 @@ import org.hibernate.cache.CacheException;
  * @author Steve Ebersole
  */
 public class TransactionalAccess implements CollectionRegionAccessStrategy {
-	private static final Log log = LogFactory.getLog( TransactionalAccess.class );
+	private static final Logger log = LoggerFactory.getLogger( TransactionalAccess.class );
 
 	private final CollectionRegionImpl region;
 
diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java
index 600c135719..83bea69bba 100644
--- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java
+++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java
@@ -15,8 +15,8 @@
  */
 package org.hibernate.cache.jbc2.entity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 import org.hibernate.cache.CacheException;
@@ -30,7 +30,7 @@ import org.hibernate.cache.CacheException;
  * @author Steve Ebersole
  */
 public class ReadOnlyAccess extends TransactionalAccess {
-	private static final Log log = LogFactory.getLog( ReadOnlyAccess.class );
+	private static final Logger log = LoggerFactory.getLogger( ReadOnlyAccess.class );
 
 	public ReadOnlyAccess(EntityRegionImpl region) {
 		super( region );
diff --git a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java
index ace75d7add..e3a9ec8124 100644
--- a/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java
+++ b/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java
@@ -15,8 +15,8 @@
  */
 package org.hibernate.cache.jbc2.entity;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.lock.TimeoutException;
 
@@ -32,7 +32,7 @@ import org.hibernate.cache.CacheException;
  * @author Steve Ebersole
  */
 public class TransactionalAccess implements EntityRegionAccessStrategy {
-	private static final Log log = LogFactory.getLog( TransactionalAccess.class );
+	private static final Logger log = LoggerFactory.getLogger( TransactionalAccess.class );
 
 	private final EntityRegionImpl region;
 
diff --git a/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java b/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java
index 23acd75715..ba1d72badf 100644
--- a/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java
+++ b/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java
@@ -8,8 +8,8 @@ import java.util.Properties;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.mchange.v2.c3p0.DataSources;
 
@@ -27,7 +27,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class C3P0ConnectionProvider implements ConnectionProvider {
 
-	private static final Log log = LogFactory.getLog( C3P0ConnectionProvider.class );
+	private static final Logger log = LoggerFactory.getLogger( C3P0ConnectionProvider.class );
 
 	//swaldman 2006-08-28: define c3p0-style configuration parameters for properties with
 	//                     hibernate-specific overrides to detect and warn about conflicting
@@ -97,7 +97,7 @@ public class C3P0ConnectionProvider implements ConnectionProvider {
 				}
 				catch ( ClassNotFoundException e ) {
 					String msg = "JDBC Driver class not found: " + jdbcDriverClass;
-					log.fatal( msg, e );
+					log.error( msg, e );
 					throw new HibernateException( msg, e );
 				}
 			}
@@ -159,7 +159,7 @@ public class C3P0ConnectionProvider implements ConnectionProvider {
 			ds = DataSources.pooledDataSource( unpooled, allProps );
 		}
 		catch ( Exception e ) {
-			log.fatal( "could not instantiate C3P0 connection pool", e );
+			log.error( "could not instantiate C3P0 connection pool", e );
 			throw new HibernateException( "Could not instantiate C3P0 connection pool", e );
 		}
 
diff --git a/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java b/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java
index d027cc2ba1..31d00544eb 100644
--- a/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java
+++ b/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java
@@ -12,8 +12,8 @@ import org.hibernate.util.PropertiesHelper;
 import org.hibernate.util.StringHelper;
 import org.hibernate.util.ConfigHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.logicalcobwebs.proxool.ProxoolException;
 import org.logicalcobwebs.proxool.ProxoolFacade;
@@ -30,7 +30,7 @@ public class ProxoolConnectionProvider implements ConnectionProvider {
 
 	private static final String PROXOOL_JDBC_STEM = "proxool.";
 
-	private static final Log log = LogFactory.getLog(ProxoolConnectionProvider.class);
+	private static final Logger log = LoggerFactory.getLogger(ProxoolConnectionProvider.class);
 
 	private String proxoolAlias;
 
diff --git a/core/pom.xml b/core/pom.xml
index 1db50e0d2c..9725bd2f24 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,10 +29,6 @@
             <artifactId>commons-collections</artifactId>
             <version>3.1</version>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
diff --git a/core/src/main/antlr/hql-sql.g b/core/src/main/antlr/hql-sql.g
index 0bc54d5f34..03314bc470 100644
--- a/core/src/main/antlr/hql-sql.g
+++ b/core/src/main/antlr/hql-sql.g
@@ -3,8 +3,8 @@ header
 // $Id: hql-sql.g 10001 2006-06-08 21:08:04Z steve.ebersole@jboss.com $
 package org.hibernate.hql.antlr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 }
 
 /**
@@ -54,7 +54,7 @@ tokens
 
 // -- Declarations --
 {
-	private static Log log = LogFactory.getLog( HqlSqlBaseWalker.class );
+	private static Logger log = LoggerFactory.getLogger( HqlSqlBaseWalker.class );
 
 	private int level = 0;
 	private boolean inSelect = false;
diff --git a/core/src/main/antlr/sql-gen.g b/core/src/main/antlr/sql-gen.g
index d3ef40061b..e7d6abfbc5 100644
--- a/core/src/main/antlr/sql-gen.g
+++ b/core/src/main/antlr/sql-gen.g
@@ -3,8 +3,8 @@ header
 //   $Id: sql-gen.g 10001 2006-06-08 21:08:04Z steve.ebersole@jboss.com $
 package org.hibernate.hql.antlr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 }
 /**
@@ -28,7 +28,7 @@ options {
 }
 
 {
-	private static Log log = LogFactory.getLog(SqlGeneratorBase.class);
+	private static Logger log = LoggerFactory.getLogger(SqlGeneratorBase.class);
 
    /** the buffer resulting SQL statement is written to */
 	private StringBuffer buf = new StringBuffer();
diff --git a/core/src/main/java/org/hibernate/AssertionFailure.java b/core/src/main/java/org/hibernate/AssertionFailure.java
index 002d7c2a1d..053428c824 100644
--- a/core/src/main/java/org/hibernate/AssertionFailure.java
+++ b/core/src/main/java/org/hibernate/AssertionFailure.java
@@ -2,8 +2,8 @@
 package org.hibernate;
 
 import org.hibernate.exception.NestableRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Indicates failure of an assertion: a possible bug in Hibernate.
@@ -13,7 +13,7 @@ import org.apache.commons.logging.LogFactory;
 
 public class AssertionFailure extends NestableRuntimeException {
 
-	private static final Log log = LogFactory.getLog(AssertionFailure.class);
+	private static final Logger log = LoggerFactory.getLogger(AssertionFailure.class);
 
 	private static final String MESSAGE = "an assertion failure occured (this may indicate a bug in Hibernate, but is more likely due to unsafe use of the session)";
 
diff --git a/core/src/main/java/org/hibernate/LazyInitializationException.java b/core/src/main/java/org/hibernate/LazyInitializationException.java
index c7d1072797..0f4b0b94f7 100644
--- a/core/src/main/java/org/hibernate/LazyInitializationException.java
+++ b/core/src/main/java/org/hibernate/LazyInitializationException.java
@@ -1,7 +1,7 @@
 //$Id: LazyInitializationException.java 4458 2004-08-29 09:59:17Z oneovthafew $
 package org.hibernate;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 /**
  * Indicates access to unfetched data outside of a session context.
@@ -16,7 +16,7 @@ public class LazyInitializationException extends HibernateException {
 
 	public LazyInitializationException(String msg) {
 		super(msg);
-		LogFactory.getLog(LazyInitializationException.class).error(msg, this);
+		LoggerFactory.getLogger( LazyInitializationException.class ).error( msg, this );
 	}
 
 }
diff --git a/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java b/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java
index aa21d75457..572fd6b3a4 100644
--- a/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java
+++ b/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java
@@ -11,8 +11,8 @@ import net.sf.cglib.transform.ClassTransformerFactory;
 import net.sf.cglib.transform.TransformingClassLoader;
 import net.sf.cglib.transform.impl.InterceptFieldFilter;
 import net.sf.cglib.transform.impl.InterceptFieldTransformer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.bytecode.BytecodeProvider;
 import org.hibernate.bytecode.ProxyFactoryFactory;
 import org.hibernate.bytecode.ReflectionOptimizer;
@@ -27,7 +27,7 @@ import org.objectweb.asm.Type;
  */
 public class BytecodeProviderImpl implements BytecodeProvider {
 
-	private static final Log log = LogFactory.getLog( BytecodeProviderImpl.class );
+	private static final Logger log = LoggerFactory.getLogger( BytecodeProviderImpl.class );
 
 	public ProxyFactoryFactory getProxyFactoryFactory() {
 		return new ProxyFactoryFactoryImpl();
diff --git a/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java b/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java
index 3ba41ea3cf..7659c2a5b6 100644
--- a/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java
+++ b/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java
@@ -14,8 +14,8 @@ import net.sf.cglib.transform.impl.InterceptFieldFilter;
 import net.sf.cglib.transform.impl.InterceptFieldTransformer;
 import net.sf.cglib.core.ClassNameReader;
 import net.sf.cglib.core.DebuggingClassWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.bytecode.AbstractClassTransformerImpl;
 import org.hibernate.bytecode.util.FieldFilter;
 import org.hibernate.bytecode.util.ClassFilter;
@@ -34,7 +34,7 @@ import org.objectweb.asm.attrs.Attributes;
  */
 public class CglibClassTransformer extends AbstractClassTransformerImpl {
 
-	private static Log log = LogFactory.getLog( CglibClassTransformer.class.getName() );
+	private static Logger log = LoggerFactory.getLogger( CglibClassTransformer.class.getName() );
 
 	public CglibClassTransformer(ClassFilter classFilter, FieldFilter fieldFilter) {
 		super( classFilter, fieldFilter );
diff --git a/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java b/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java
index 80d2ccb64f..9c89db6be1 100644
--- a/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java
+++ b/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java
@@ -2,8 +2,8 @@ package org.hibernate.bytecode.javassist;
 
 import java.lang.reflect.Modifier;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.bytecode.BytecodeProvider;
 import org.hibernate.bytecode.ClassTransformer;
 import org.hibernate.bytecode.ProxyFactoryFactory;
@@ -19,7 +19,7 @@ import org.hibernate.util.StringHelper;
  */
 public class BytecodeProviderImpl implements BytecodeProvider {
 
-	private static final Log log = LogFactory.getLog( BytecodeProviderImpl.class );
+	private static final Logger log = LoggerFactory.getLogger( BytecodeProviderImpl.class );
 
 	public ProxyFactoryFactory getProxyFactoryFactory() {
 		return new ProxyFactoryFactoryImpl();
diff --git a/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java b/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java
index 95f77747c8..b954325783 100644
--- a/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java
+++ b/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java
@@ -9,8 +9,8 @@ import java.io.IOException;
 import java.security.ProtectionDomain;
 
 import javassist.bytecode.ClassFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.AbstractClassTransformerImpl;
 import org.hibernate.bytecode.util.ClassFilter;
@@ -24,7 +24,7 @@ import org.hibernate.bytecode.util.ClassFilter;
  */
 public class JavassistClassTransformer extends AbstractClassTransformerImpl {
 
-	private static Log log = LogFactory.getLog( JavassistClassTransformer.class.getName() );
+	private static Logger log = LoggerFactory.getLogger( JavassistClassTransformer.class.getName() );
 
 	public JavassistClassTransformer(ClassFilter classFilter, org.hibernate.bytecode.util.FieldFilter fieldFilter) {
 		super( classFilter, fieldFilter );
diff --git a/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java b/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java
index 591fd8bc08..2cab0a39d3 100644
--- a/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java
+++ b/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java
@@ -7,8 +7,8 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.cfg.Environment;
 import org.hibernate.util.NamingHelper;
 import org.hibernate.util.StringHelper;
@@ -21,7 +21,7 @@ import org.hibernate.util.StringHelper;
  */
 public abstract class AbstractJndiBoundCacheProvider implements CacheProvider {
 
-	private static final Log log = LogFactory.getLog( AbstractJndiBoundCacheProvider.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractJndiBoundCacheProvider.class );
 	private Object cache;
 
 	protected void prepare(Properties properties) {
diff --git a/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java b/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java
index aeeb769d06..659e9493b3 100644
--- a/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java
+++ b/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java
@@ -3,8 +3,8 @@ package org.hibernate.cache;
 
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 
@@ -22,7 +22,7 @@ public class NonstrictReadWriteCache implements CacheConcurrencyStrategy {
 
 	private Cache cache;
 
-	private static final Log log = LogFactory.getLog( NonstrictReadWriteCache.class );
+	private static final Logger log = LoggerFactory.getLogger( NonstrictReadWriteCache.class );
 
 	public NonstrictReadWriteCache() {
 	}
diff --git a/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java b/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java
index 4c5257b6ca..7c75d76950 100644
--- a/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java
+++ b/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java
@@ -3,8 +3,8 @@ package org.hibernate.cache;
 
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 
@@ -15,7 +15,7 @@ import org.hibernate.cache.access.SoftLock;
 public class ReadOnlyCache implements CacheConcurrencyStrategy {
 	
 	private Cache cache;
-	private static final Log log = LogFactory.getLog(ReadOnlyCache.class);
+	private static final Logger log = LoggerFactory.getLogger(ReadOnlyCache.class);
 	
 	public ReadOnlyCache() {}
 	
diff --git a/core/src/main/java/org/hibernate/cache/ReadWriteCache.java b/core/src/main/java/org/hibernate/cache/ReadWriteCache.java
index 1b0f612f4d..a5d235a8c2 100644
--- a/core/src/main/java/org/hibernate/cache/ReadWriteCache.java
+++ b/core/src/main/java/org/hibernate/cache/ReadWriteCache.java
@@ -4,8 +4,8 @@ package org.hibernate.cache;
 import java.io.Serializable;
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 
@@ -27,7 +27,7 @@ import org.hibernate.cache.access.SoftLock;
  */
 public class ReadWriteCache implements CacheConcurrencyStrategy {
 
-	private static final Log log = LogFactory.getLog(ReadWriteCache.class);
+	private static final Logger log = LoggerFactory.getLogger(ReadWriteCache.class);
 
 	private Cache cache;
 	private int nextLockId;
diff --git a/core/src/main/java/org/hibernate/cache/StandardQueryCache.java b/core/src/main/java/org/hibernate/cache/StandardQueryCache.java
index 5c862a999d..89803b0294 100644
--- a/core/src/main/java/org/hibernate/cache/StandardQueryCache.java
+++ b/core/src/main/java/org/hibernate/cache/StandardQueryCache.java
@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.UnresolvableObjectException;
@@ -28,7 +28,7 @@ import org.hibernate.type.TypeFactory;
  */
 public class StandardQueryCache implements QueryCache {
 
-	private static final Log log = LogFactory.getLog( StandardQueryCache.class );
+	private static final Logger log = LoggerFactory.getLogger( StandardQueryCache.class );
 
 	private QueryResultsRegion cacheRegion;
 	private UpdateTimestampsCache updateTimestampsCache;
diff --git a/core/src/main/java/org/hibernate/cache/TransactionalCache.java b/core/src/main/java/org/hibernate/cache/TransactionalCache.java
index 1ce435a6fe..a1497ebd0b 100644
--- a/core/src/main/java/org/hibernate/cache/TransactionalCache.java
+++ b/core/src/main/java/org/hibernate/cache/TransactionalCache.java
@@ -3,8 +3,8 @@ package org.hibernate.cache;
 
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.access.SoftLock;
 
@@ -18,7 +18,7 @@ import org.hibernate.cache.access.SoftLock;
  */
 public class TransactionalCache implements CacheConcurrencyStrategy {
 
-	private static final Log log = LogFactory.getLog( TransactionalCache.class );
+	private static final Logger log = LoggerFactory.getLogger( TransactionalCache.class );
 
 	private Cache cache;
 
diff --git a/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java b/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java
index 0f5d56ba73..863047ec11 100644
--- a/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java
+++ b/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java
@@ -6,8 +6,8 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Settings;
@@ -24,7 +24,7 @@ import org.hibernate.cfg.Settings;
  */
 public class UpdateTimestampsCache {
 	public static final String REGION_NAME = UpdateTimestampsCache.class.getName();
-	private static final Log log = LogFactory.getLog( UpdateTimestampsCache.class );
+	private static final Logger log = LoggerFactory.getLogger( UpdateTimestampsCache.class );
 
 	private final TimestampsRegion region;
 
diff --git a/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java b/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java
index 6fa4542f90..da8a3bd1cb 100644
--- a/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java
+++ b/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java
@@ -1,7 +1,7 @@
 package org.hibernate.cache.impl.bridge;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.CollectionRegion;
 import org.hibernate.cache.Cache;
@@ -23,7 +23,7 @@ import org.hibernate.cfg.Settings;
  * @author Steve Ebersole
  */
 public class CollectionRegionAdapter extends BaseTransactionalDataRegionAdapter implements CollectionRegion {
-	private static final Log log = LogFactory.getLog( CollectionRegionAdapter.class );
+	private static final Logger log = LoggerFactory.getLogger( CollectionRegionAdapter.class );
 
 	public CollectionRegionAdapter(Cache underlyingCache, Settings settings, CacheDataDescription metadata) {
 		super( underlyingCache, settings, metadata );
diff --git a/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java b/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java
index 105a6fe1e5..af8705b801 100644
--- a/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java
+++ b/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java
@@ -1,7 +1,7 @@
 package org.hibernate.cache.impl.bridge;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.Cache;
@@ -23,7 +23,7 @@ import org.hibernate.cfg.Settings;
  * @author Steve Ebersole
  */
 public class EntityRegionAdapter extends BaseTransactionalDataRegionAdapter implements EntityRegion {
-	private static final Log log = LogFactory.getLog( EntityRegionAdapter.class );
+	private static final Logger log = LoggerFactory.getLogger( EntityRegionAdapter.class );
 
 	public EntityRegionAdapter(Cache underlyingCache, Settings settings, CacheDataDescription metadata) {
 		super( underlyingCache, settings, metadata );
diff --git a/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java b/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java
index f8ba8d616e..9ed8b7feff 100644
--- a/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java
+++ b/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java
@@ -2,8 +2,8 @@ package org.hibernate.cache.impl.bridge;
 
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.RegionFactory;
 import org.hibernate.cache.CacheProvider;
@@ -27,7 +27,7 @@ import org.hibernate.cfg.Settings;
  */
 public class RegionFactoryCacheProviderBridge implements RegionFactory {
 	public static final String DEF_PROVIDER = NoCacheProvider.class.getName();
-	private static final Log log = LogFactory.getLog( RegionFactoryCacheProviderBridge.class );
+	private static final Logger log = LoggerFactory.getLogger( RegionFactoryCacheProviderBridge.class );
 
 	private CacheProvider cacheProvider;
 	private Settings settings;
diff --git a/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java b/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java
index 81ab8b6c52..21343fd6dd 100644
--- a/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java
+++ b/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java
@@ -5,8 +5,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.IndexedCollection;
@@ -20,7 +20,7 @@ import org.hibernate.mapping.Value;
  * @author Emmanuel Bernard
  */
 public abstract class CollectionSecondPass implements SecondPass {
-	private static Log log = LogFactory.getLog( CollectionSecondPass.class );
+	private static Logger log = LoggerFactory.getLogger( CollectionSecondPass.class );
 	Mappings mappings;
 	Collection collection;
 	private Map localInheritedMetas;
diff --git a/core/src/main/java/org/hibernate/cfg/Configuration.java b/core/src/main/java/org/hibernate/cfg/Configuration.java
index f8445522f6..cd995d7991 100644
--- a/core/src/main/java/org/hibernate/cfg/Configuration.java
+++ b/core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -26,8 +26,8 @@ import java.util.TreeMap;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.dom4j.Attribute;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
@@ -117,7 +117,7 @@ import org.xml.sax.InputSource;
  */
 public class Configuration implements Serializable {
 
-	private static Log log = LogFactory.getLog( Configuration.class );
+	private static Logger log = LoggerFactory.getLogger( Configuration.class );
 
 	protected Map classes;
 	protected Map imports;
diff --git a/core/src/main/java/org/hibernate/cfg/Environment.java b/core/src/main/java/org/hibernate/cfg/Environment.java
index 8df1df83b4..a87c9b2fa0 100644
--- a/core/src/main/java/org/hibernate/cfg/Environment.java
+++ b/core/src/main/java/org/hibernate/cfg/Environment.java
@@ -11,8 +11,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.BytecodeProvider;
@@ -490,7 +490,7 @@ public final class Environment {
 	private static final Map OBSOLETE_PROPERTIES = new HashMap();
 	private static final Map RENAMED_PROPERTIES = new HashMap();
 
-	private static final Log log = LogFactory.getLog(Environment.class);
+	private static final Logger log = LoggerFactory.getLogger(Environment.class);
 
 	/**
 	 * Issues warnings to the user when any obsolete property names are used.
diff --git a/core/src/main/java/org/hibernate/cfg/HbmBinder.java b/core/src/main/java/org/hibernate/cfg/HbmBinder.java
index fb30cdfff8..379b291fec 100644
--- a/core/src/main/java/org/hibernate/cfg/HbmBinder.java
+++ b/core/src/main/java/org/hibernate/cfg/HbmBinder.java
@@ -9,8 +9,8 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.Element;
@@ -85,7 +85,7 @@ import org.hibernate.util.StringHelper;
  */
 public final class HbmBinder {
 
-	private static final Log log = LogFactory.getLog( HbmBinder.class );
+	private static final Logger log = LoggerFactory.getLogger( HbmBinder.class );
 
 	/**
 	 * Private constructor to disallow instantiation.
diff --git a/core/src/main/java/org/hibernate/cfg/Mappings.java b/core/src/main/java/org/hibernate/cfg/Mappings.java
index ac2ef6a73e..5eb48fc55c 100644
--- a/core/src/main/java/org/hibernate/cfg/Mappings.java
+++ b/core/src/main/java/org/hibernate/cfg/Mappings.java
@@ -8,8 +8,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.HashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.DuplicateMappingException;
 import org.hibernate.MappingException;
 import org.hibernate.engine.FilterDefinition;
@@ -33,7 +33,7 @@ import org.hibernate.util.StringHelper;
  */
 public class Mappings implements Serializable {
 
-	private static final Log log = LogFactory.getLog(Mappings.class);
+	private static final Logger log = LoggerFactory.getLogger(Mappings.class);
 
 	protected final Map classes;
 	protected final Map collections;
diff --git a/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java b/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java
index 8d47d87d5e..2ff3bef3ac 100644
--- a/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java
+++ b/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java
@@ -11,14 +11,14 @@ import org.hibernate.engine.NamedSQLQueryDefinition;
 import org.hibernate.engine.ResultSetMappingDefinition;
 import org.dom4j.Attribute;
 import org.dom4j.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Emmanuel Bernard
  */
 public class NamedSQLQuerySecondPass extends ResultSetMappingBinder implements QuerySecondPass {
-	private static Log log = LogFactory.getLog( NamedSQLQuerySecondPass.class);
+	private static Logger log = LoggerFactory.getLogger( NamedSQLQuerySecondPass.class);
 	private Element queryElem;
 	private String path;
 	private Mappings mappings;
diff --git a/core/src/main/java/org/hibernate/cfg/SettingsFactory.java b/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
index d88733b5ee..b81c173f0f 100644
--- a/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
+++ b/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
@@ -10,8 +10,8 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -46,7 +46,7 @@ import org.hibernate.util.StringHelper;
 public class SettingsFactory implements Serializable {
 
 	public static final String DEF_CACHE_REG_FACTORY = NoCachingRegionFactory.class.getName();
-	private static final Log log = LogFactory.getLog(SettingsFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(SettingsFactory.class);
 
 	protected SettingsFactory() {
 	}
diff --git a/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java b/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java
index 5ace7ee7da..11178dcc75 100644
--- a/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java
+++ b/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.loader.CollectionAliases;
@@ -28,7 +28,7 @@ import org.hibernate.type.Type;
 public class PersistentArrayHolder extends AbstractPersistentCollection {
 	protected Object array;
 
-	private static final Log log = LogFactory.getLog(PersistentArrayHolder.class);
+	private static final Logger log = LoggerFactory.getLogger(PersistentArrayHolder.class);
 
 	//just to help out during the load (ugly, i know)
 	private transient Class elementClass;
diff --git a/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java b/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
index fbf05c7572..8c3f1fdae4 100644
--- a/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
+++ b/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java
@@ -13,8 +13,8 @@ import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
@@ -34,11 +34,11 @@ import org.hibernate.util.ReflectHelper;
 
 public final class ConnectionProviderFactory {
 
-	private static final Log log = LogFactory.getLog(ConnectionProviderFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(ConnectionProviderFactory.class);
 
 	/**
 	 * Instantiate a <tt>ConnectionProvider</tt> using <tt>System</tt> properties.
-	 * @return ConnectionProvider
+	 * @return The created connection provider.
 	 * @throws HibernateException
 	 */
 	public static ConnectionProvider newConnectionProvider() throws HibernateException {
@@ -57,11 +57,11 @@ public final class ConnectionProviderFactory {
 	}
 
 	/**
-	 * Instantiate a <tt>ConnectionProvider</tt> using given properties.
-	 * Method newConnectionProvider.
-	 * @param properties hibernate <tt>SessionFactory</tt> properties
-	 * @Param connectionProviderInjectionData object to be injected in the conenction provided
-	 * @return ConnectionProvider
+	 * Create a connection provider based on the given information.
+	 *
+	 * @param properties Properties being used to build the {@link org.hibernate.SessionFactory}.
+	 * @param connectionProviderInjectionData Soemthing to be injected in the conenction provided
+	 * @return The created connection provider
 	 * @throws HibernateException
 	 */
 	public static ConnectionProvider newConnectionProvider(Properties properties, Map connectionProviderInjectionData) throws HibernateException {
@@ -72,8 +72,8 @@ public final class ConnectionProviderFactory {
 				log.info("Initializing connection provider: " + providerClass);
 				connections = (ConnectionProvider) ReflectHelper.classForName(providerClass).newInstance();
 			}
-			catch (Exception e) {
-				log.fatal("Could not instantiate connection provider", e);
+			catch ( Exception e ) {
+				log.error( "Could not instantiate connection provider", e );
 				throw new HibernateException("Could not instantiate connection provider: " + providerClass);
 			}
 		}
diff --git a/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java b/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java
index 83cb3f6593..d76bbba620 100644
--- a/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java
+++ b/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java
@@ -11,8 +11,8 @@ import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
 import org.hibernate.util.NamingHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A connection provider that uses a <tt>DataSource</tt> registered with JNDI.
@@ -26,7 +26,7 @@ public class DatasourceConnectionProvider implements ConnectionProvider {
 	private String user;
 	private String pass;
 
-	private static final Log log = LogFactory.getLog(DatasourceConnectionProvider.class);
+	private static final Logger log = LoggerFactory.getLogger(DatasourceConnectionProvider.class);
 
 	public DataSource getDataSource() {
 		return ds;
@@ -38,24 +38,24 @@ public class DatasourceConnectionProvider implements ConnectionProvider {
 
 	public void configure(Properties props) throws HibernateException {
 
-		String jndiName = props.getProperty(Environment.DATASOURCE);
-		if (jndiName==null) {
+		String jndiName = props.getProperty( Environment.DATASOURCE );
+		if ( jndiName == null ) {
 			String msg = "datasource JNDI name was not specified by property " + Environment.DATASOURCE;
-			log.fatal(msg);
-			throw new HibernateException(msg);
+			log.error( msg );
+			throw new HibernateException( msg );
 		}
 
-		user = props.getProperty(Environment.USER);
-		pass = props.getProperty(Environment.PASS);
+		user = props.getProperty( Environment.USER );
+		pass = props.getProperty( Environment.PASS );
 
 		try {
-			ds = (DataSource) NamingHelper.getInitialContext(props).lookup(jndiName);
+			ds = ( DataSource ) NamingHelper.getInitialContext( props ).lookup( jndiName );
 		}
-		catch (Exception e) {
-			log.fatal( "Could not find datasource: " + jndiName, e );
+		catch ( Exception e ) {
+			log.error( "Could not find datasource: " + jndiName, e );
 			throw new HibernateException( "Could not find datasource", e );
 		}
-		if (ds==null) {
+		if ( ds == null ) {
 			throw new HibernateException( "Could not find datasource: " + jndiName );
 		}
 		log.info( "Using datasource: " + jndiName );
diff --git a/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java b/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java
index 1fe701bd78..5179d8942d 100644
--- a/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java
+++ b/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java
@@ -8,8 +8,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
 import org.hibernate.util.PropertiesHelper;
@@ -31,7 +31,7 @@ public class DriverManagerConnectionProvider implements ConnectionProvider {
 	private int checkedOut = 0;
 	private boolean autocommit;
 
-	private static final Log log = LogFactory.getLog(DriverManagerConnectionProvider.class);
+	private static final Logger log = LoggerFactory.getLogger(DriverManagerConnectionProvider.class);
 
 	public void configure(Properties props) throws HibernateException {
 
@@ -62,20 +62,20 @@ public class DriverManagerConnectionProvider implements ConnectionProvider {
 				}
 				catch (ClassNotFoundException e) {
 					String msg = "JDBC Driver class not found: " + driverClass;
-					log.fatal(msg, e);
+					log.error( msg, e );
 					throw new HibernateException(msg, e);
 				}
 			}
 		}
 
-		url = props.getProperty(Environment.URL);
-		if (url==null) {
+		url = props.getProperty( Environment.URL );
+		if ( url == null ) {
 			String msg = "JDBC URL was not specified by property " + Environment.URL;
-			log.fatal(msg);
-			throw new HibernateException(msg);
+			log.error( msg );
+			throw new HibernateException( msg );
 		}
 
-		connectionProps = ConnectionProviderFactory.getConnectionProperties(props);
+		connectionProps = ConnectionProviderFactory.getConnectionProperties( props );
 
 		log.info( "using driver: " + driverClass + " at URL: " + url );
 		// if debug level is enabled, then log the password, otherwise mask it
diff --git a/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java b/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java
index 540820b0b8..fd125b4d43 100644
--- a/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java
+++ b/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java
@@ -4,7 +4,7 @@ package org.hibernate.connection;
 import java.sql.Connection;
 import java.util.Properties;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 
 /**
@@ -20,7 +20,8 @@ public class UserSuppliedConnectionProvider implements ConnectionProvider {
 	 * @see org.hibernate.connection.ConnectionProvider#configure(Properties)
 	 */
 	public void configure(Properties props) throws HibernateException {
-		LogFactory.getLog(UserSuppliedConnectionProvider.class).warn("No connection properties specified - the user must supply JDBC connections");
+		LoggerFactory.getLogger( UserSuppliedConnectionProvider.class )
+				.warn( "No connection properties specified - the user must supply JDBC connections" );
 	}
 
 	/**
diff --git a/core/src/main/java/org/hibernate/context/JTASessionContext.java b/core/src/main/java/org/hibernate/context/JTASessionContext.java
index daf8a5d2b4..8a280a8588 100644
--- a/core/src/main/java/org/hibernate/context/JTASessionContext.java
+++ b/core/src/main/java/org/hibernate/context/JTASessionContext.java
@@ -5,8 +5,8 @@ import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.classic.Session;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.util.JTAHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
@@ -39,7 +39,7 @@ import java.util.Hashtable;
  */
 public class JTASessionContext implements CurrentSessionContext {
 
-	private static final Log log = LogFactory.getLog( JTASessionContext.class );
+	private static final Logger log = LoggerFactory.getLogger( JTASessionContext.class );
 
 	protected final SessionFactoryImplementor factory;
 	private transient Map currentSessionMap = new Hashtable();
diff --git a/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java b/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java
index 4330213452..7791c0c844 100644
--- a/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java
+++ b/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java
@@ -12,8 +12,8 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.transaction.Synchronization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.SessionFactory;
@@ -48,7 +48,7 @@ import org.hibernate.engine.SessionFactoryImplementor;
  */
 public class ThreadLocalSessionContext implements CurrentSessionContext {
 
-	private static final Log log = LogFactory.getLog( ThreadLocalSessionContext.class );
+	private static final Logger log = LoggerFactory.getLogger( ThreadLocalSessionContext.class );
 	private static final Class[] SESS_PROXY_INTERFACES = new Class[] {
 			org.hibernate.classic.Session.class,
 	        org.hibernate.engine.SessionImplementor.class,
diff --git a/core/src/main/java/org/hibernate/dialect/Dialect.java b/core/src/main/java/org/hibernate/dialect/Dialect.java
index 3ac0113872..c6b4822580 100644
--- a/core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -11,8 +11,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
@@ -56,7 +56,7 @@ import org.hibernate.util.StringHelper;
  */
 public abstract class Dialect {
 
-	private static final Log log = LogFactory.getLog( Dialect.class );
+	private static final Logger log = LoggerFactory.getLogger( Dialect.class );
 
 	public static final String DEFAULT_BATCH_SIZE = "15";
 	public static final String NO_BATCH = "0";
diff --git a/core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
index 7c0ffeeeaa..83fac138c1 100644
--- a/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
+++ b/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
@@ -21,8 +21,8 @@ import org.hibernate.dialect.lock.SelectLockingStrategy;
 import org.hibernate.exception.JDBCExceptionHelper;
 import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter;
 import org.hibernate.exception.ViolatedConstraintNameExtracter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An SQL dialect compatible with HSQLDB (Hypersonic SQL).
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class HSQLDialect extends Dialect {
 
-	private static final Log log = LogFactory.getLog( HSQLDialect.class );
+	private static final Logger log = LoggerFactory.getLogger( HSQLDialect.class );
 
 	private boolean schemaSupport;
 
diff --git a/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java b/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
index 1296ed87c2..4e53be006a 100644
--- a/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
+++ b/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
@@ -6,8 +6,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
@@ -30,7 +30,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class Oracle9Dialect extends Dialect {
 
-	private static final Log log = LogFactory.getLog( Oracle9Dialect.class );
+	private static final Logger log = LoggerFactory.getLogger( Oracle9Dialect.class );
 
 	public Oracle9Dialect() {
 		super();
diff --git a/core/src/main/java/org/hibernate/dialect/OracleDialect.java b/core/src/main/java/org/hibernate/dialect/OracleDialect.java
index 43f5e22fc1..1a4a3cc02f 100644
--- a/core/src/main/java/org/hibernate/dialect/OracleDialect.java
+++ b/core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -3,8 +3,8 @@ package org.hibernate.dialect;
 
 import java.sql.Types;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.sql.CaseFragment;
 import org.hibernate.sql.DecodeCaseFragment;
@@ -19,7 +19,7 @@ import org.hibernate.sql.OracleJoinFragment;
  */
 public class OracleDialect extends Oracle9Dialect {
 
-	private static final Log log = LogFactory.getLog( OracleDialect.class );
+	private static final Logger log = LoggerFactory.getLogger( OracleDialect.class );
 
 	public OracleDialect() {
 		super();
diff --git a/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java b/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
index 7e0e9974c5..14a8083452 100755
--- a/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
+++ b/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
@@ -24,14 +24,14 @@ import org.hibernate.LockMode;
 import org.hibernate.persister.entity.Lockable;
 import org.hibernate.sql.CaseFragment;
 import org.hibernate.sql.DecodeCaseFragment;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Ploski and Hanson
  */
 public class RDMSOS2200Dialect extends Dialect {
-	private static Log log = LogFactory.getLog(RDMSOS2200Dialect.class);
+	private static Logger log = LoggerFactory.getLogger(RDMSOS2200Dialect.class);
 
 	public RDMSOS2200Dialect() {
 		super();
diff --git a/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
index ae5d488709..cfa1601dac 100644
--- a/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
+++ b/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
@@ -10,8 +10,8 @@ import org.hibernate.exception.JDBCExceptionHelper;
 import org.hibernate.sql.Update;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.SessionFactoryImplementor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
@@ -27,7 +27,7 @@ import java.sql.SQLException;
  * @author Steve Ebersole
  */
 public class UpdateLockingStrategy implements LockingStrategy {
-	private static final Log log = LogFactory.getLog( UpdateLockingStrategy.class );
+	private static final Logger log = LoggerFactory.getLogger( UpdateLockingStrategy.class );
 
 	private final Lockable lockable;
 	private final LockMode lockMode;
diff --git a/core/src/main/java/org/hibernate/engine/ActionQueue.java b/core/src/main/java/org/hibernate/engine/ActionQueue.java
index 728f03a862..9715459124 100644
--- a/core/src/main/java/org/hibernate/engine/ActionQueue.java
+++ b/core/src/main/java/org/hibernate/engine/ActionQueue.java
@@ -13,8 +13,8 @@ import org.hibernate.action.BulkOperationCleanupAction;
 import org.hibernate.HibernateException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.cache.CacheException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,7 +37,7 @@ import java.io.ObjectOutputStream;
  */
 public class ActionQueue {
 
-	private static final Log log = LogFactory.getLog( ActionQueue.class );
+	private static final Logger log = LoggerFactory.getLogger( ActionQueue.class );
 	private static final int INIT_QUEUE_LIST_SIZE = 5;
 
 	private SessionImplementor session;
diff --git a/core/src/main/java/org/hibernate/engine/Cascade.java b/core/src/main/java/org/hibernate/engine/Cascade.java
index 7ee32db245..9ae14d36bd 100644
--- a/core/src/main/java/org/hibernate/engine/Cascade.java
+++ b/core/src/main/java/org/hibernate/engine/Cascade.java
@@ -4,8 +4,8 @@ package org.hibernate.engine;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.collection.PersistentCollection;
@@ -72,7 +72,7 @@ public final class Cascade {
 	public static final int BEFORE_MERGE = 0;
 
 
-	private static final Log log = LogFactory.getLog( Cascade.class );
+	private static final Logger log = LoggerFactory.getLogger( Cascade.class );
 
 
 	private int cascadeTo;
diff --git a/core/src/main/java/org/hibernate/engine/CascadingAction.java b/core/src/main/java/org/hibernate/engine/CascadingAction.java
index c035b70f81..f9b08c5871 100755
--- a/core/src/main/java/org/hibernate/engine/CascadingAction.java
+++ b/core/src/main/java/org/hibernate/engine/CascadingAction.java
@@ -5,8 +5,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.ReplicationMode;
@@ -26,7 +26,7 @@ import org.hibernate.type.EntityType;
  */
 public abstract class CascadingAction {
 
-	private static final Log log = LogFactory.getLog( CascadingAction.class );
+	private static final Logger log = LoggerFactory.getLogger( CascadingAction.class );
 
 
 	// the CascadingAction contract ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/core/src/main/java/org/hibernate/engine/CollectionEntry.java b/core/src/main/java/org/hibernate/engine/CollectionEntry.java
index f721916ad5..4289927772 100644
--- a/core/src/main/java/org/hibernate/engine/CollectionEntry.java
+++ b/core/src/main/java/org/hibernate/engine/CollectionEntry.java
@@ -7,8 +7,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
@@ -24,7 +24,7 @@ import org.hibernate.pretty.MessageHelper;
  */
 public final class CollectionEntry implements Serializable {
 
-	private static final Log log = LogFactory.getLog(CollectionEntry.class);
+	private static final Logger log = LoggerFactory.getLogger(CollectionEntry.class);
 	
 	//ATTRIBUTES MAINTAINED BETWEEN FLUSH CYCLES
 	
diff --git a/core/src/main/java/org/hibernate/engine/Collections.java b/core/src/main/java/org/hibernate/engine/Collections.java
index 202b3e3262..b2a9786344 100755
--- a/core/src/main/java/org/hibernate/engine/Collections.java
+++ b/core/src/main/java/org/hibernate/engine/Collections.java
@@ -1,8 +1,8 @@
 //$Id: Collections.java 8694 2005-11-28 19:28:17Z steveebersole $
 package org.hibernate.engine;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -21,7 +21,7 @@ public final class Collections {
 
 	private Collections() {}
 
-	private static final Log log = LogFactory.getLog(Collections.class);
+	private static final Logger log = LoggerFactory.getLogger(Collections.class);
 
 	/**
 	 * record the fact that this collection was dereferenced
diff --git a/core/src/main/java/org/hibernate/engine/IdentifierValue.java b/core/src/main/java/org/hibernate/engine/IdentifierValue.java
index ad2a94c2d5..b476942dbf 100755
--- a/core/src/main/java/org/hibernate/engine/IdentifierValue.java
+++ b/core/src/main/java/org/hibernate/engine/IdentifierValue.java
@@ -3,8 +3,8 @@ package org.hibernate.engine;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A strategy for determining if an identifier value is an identifier of
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class IdentifierValue {
 
-	private static final Log log = LogFactory.getLog(IdentifierValue.class);
+	private static final Logger log = LoggerFactory.getLogger(IdentifierValue.class);
 	
 	private final Serializable value;
 	
diff --git a/core/src/main/java/org/hibernate/engine/ParameterBinder.java b/core/src/main/java/org/hibernate/engine/ParameterBinder.java
index b3b5394ccd..d1c28ea661 100644
--- a/core/src/main/java/org/hibernate/engine/ParameterBinder.java
+++ b/core/src/main/java/org/hibernate/engine/ParameterBinder.java
@@ -3,8 +3,8 @@ package org.hibernate.engine;
 
 import org.hibernate.HibernateException;
 import org.hibernate.type.Type;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ import java.util.Iterator;
  */
 public class ParameterBinder {
 
-	private static final Log log = LogFactory.getLog( ParameterBinder.class );
+	private static final Logger log = LoggerFactory.getLogger( ParameterBinder.class );
 
 	public static interface NamedParameterSource {
 		public int[] getNamedParameterLocations(String name);
diff --git a/core/src/main/java/org/hibernate/engine/QueryParameters.java b/core/src/main/java/org/hibernate/engine/QueryParameters.java
index 6383c5f3e5..ece4b4a9eb 100644
--- a/core/src/main/java/org/hibernate/engine/QueryParameters.java
+++ b/core/src/main/java/org/hibernate/engine/QueryParameters.java
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.QueryException;
@@ -27,7 +27,7 @@ import org.hibernate.util.ArrayHelper;
  * @author Gavin King
  */
 public final class QueryParameters {
-	private static final Log log = LogFactory.getLog(QueryParameters.class);
+	private static final Logger log = LoggerFactory.getLogger(QueryParameters.class);
 
 	private Type[] positionalParameterTypes;
 	private Object[] positionalParameterValues;
diff --git a/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java b/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
index 90efcf3542..d2af22e426 100644
--- a/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
+++ b/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
@@ -51,8 +51,8 @@ public class StatefulPersistenceContext implements PersistenceContext {
 
 	public static final Object NO_ROW = new MarkerObject( "NO_ROW" );
 
-	private static final Log log = LogFactory.getLog( StatefulPersistenceContext.class );
-	private static final Log PROXY_WARN_LOG = LogFactory.getLog( StatefulPersistenceContext.class.getName() + ".ProxyWarnLog" );
+	private static final Logger log = LoggerFactory.getLogger( StatefulPersistenceContext.class );
+	private static final Logger PROXY_WARN_LOG = LoggerFactory.getLogger( StatefulPersistenceContext.class.getName() + ".ProxyWarnLog" );
 	private static final int INIT_COLL_SIZE = 8;
 
 	private SessionImplementor session;
diff --git a/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java b/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java
index 2fcdb3a3b3..527f8772bb 100755
--- a/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java
+++ b/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java
@@ -3,8 +3,8 @@ package org.hibernate.engine;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
 import org.hibernate.HibernateException;
@@ -31,7 +31,7 @@ import org.hibernate.type.TypeFactory;
  */
 public final class TwoPhaseLoad {
 
-	private static final Log log = LogFactory.getLog(TwoPhaseLoad.class);
+	private static final Logger log = LoggerFactory.getLogger(TwoPhaseLoad.class);
 	
 	private TwoPhaseLoad() {}
 
diff --git a/core/src/main/java/org/hibernate/engine/VersionValue.java b/core/src/main/java/org/hibernate/engine/VersionValue.java
index 7f42e95525..72645db2d0 100755
--- a/core/src/main/java/org/hibernate/engine/VersionValue.java
+++ b/core/src/main/java/org/hibernate/engine/VersionValue.java
@@ -1,8 +1,8 @@
 //$Id: VersionValue.java 7017 2005-06-05 04:31:34Z oneovthafew $
 package org.hibernate.engine;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.id.IdentifierGeneratorFactory;
 
@@ -16,7 +16,7 @@ import org.hibernate.id.IdentifierGeneratorFactory;
  */
 public class VersionValue {
 
-	private static final Log log = LogFactory.getLog(VersionValue.class);
+	private static final Logger log = LoggerFactory.getLogger(VersionValue.class);
 
 	private final Object value;
 	/**
diff --git a/core/src/main/java/org/hibernate/engine/Versioning.java b/core/src/main/java/org/hibernate/engine/Versioning.java
index ba658d77e0..d4a2a2ca50 100644
--- a/core/src/main/java/org/hibernate/engine/Versioning.java
+++ b/core/src/main/java/org/hibernate/engine/Versioning.java
@@ -1,8 +1,8 @@
 //$Id: Versioning.java 10857 2006-11-21 23:28:07Z steve.ebersole@jboss.com $
 package org.hibernate.engine;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.VersionType;
@@ -36,7 +36,7 @@ public final class Versioning {
 	 */
 	public static final int OPTIMISTIC_LOCK_DIRTY = 1;
 
-	private static final Log log = LogFactory.getLog( Versioning.class );
+	private static final Logger log = LoggerFactory.getLogger( Versioning.class );
 
 	/**
 	 * Private constructor disallowing instantiation.
diff --git a/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java b/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java
index 8491f2d8a7..fb04e48d42 100644
--- a/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java
+++ b/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java
@@ -8,8 +8,8 @@ import java.util.ArrayList;
 import java.util.Set;
 import java.util.HashSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.collection.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
@@ -35,7 +35,7 @@ import org.hibernate.engine.SessionFactoryImplementor;
  * @author Steve Ebersole
  */
 public class CollectionLoadContext {
-	private static final Log log = LogFactory.getLog( CollectionLoadContext.class );
+	private static final Logger log = LoggerFactory.getLogger( CollectionLoadContext.class );
 
 	private final LoadContexts loadContexts;
 	private final ResultSet resultSet;
diff --git a/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java b/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java
index 760c3cb0e4..dc4d906fdc 100644
--- a/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java
+++ b/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java
@@ -4,8 +4,8 @@ import java.sql.ResultSet;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@inheritDoc}
@@ -13,7 +13,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Steve Ebersole
  */
 public class EntityLoadContext {
-	private static final Log log = LogFactory.getLog( EntityLoadContext.class );
+	private static final Logger log = LoggerFactory.getLogger( EntityLoadContext.class );
 
 	private final LoadContexts loadContexts;
 	private final ResultSet resultSet;
diff --git a/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java b/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java
index c78c6440e7..44449db6f5 100644
--- a/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java
+++ b/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java
@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.HashMap;
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.util.IdentityMap;
 import org.hibernate.engine.PersistenceContext;
@@ -36,7 +36,7 @@ import org.hibernate.EntityMode;
  * @author Steve Ebersole
  */
 public class LoadContexts {
-	private static final Log log = LogFactory.getLog( LoadContexts.class );
+	private static final Logger log = LoggerFactory.getLogger( LoadContexts.class );
 
 	private final PersistenceContext persistenceContext;
 	private Map collectionLoadContexts;
diff --git a/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java b/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java
index 7fc687a41e..13f10fdfd0 100644
--- a/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java
+++ b/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java
@@ -17,8 +17,8 @@ import org.hibernate.engine.QueryParameters;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.RowSelection;
 import org.hibernate.event.EventSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -38,7 +38,7 @@ public class HQLQueryPlan implements Serializable {
 
 	// TODO : keep seperate notions of QT[] here for shallow/non-shallow queries...
 
-	private static final Log log = LogFactory.getLog( HQLQueryPlan.class );
+	private static final Logger log = LoggerFactory.getLogger( HQLQueryPlan.class );
 
 	private final String sourceQuery;
 	private final QueryTranslator[] translators;
diff --git a/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java b/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java
index 51384b5329..f30ecc4331 100644
--- a/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java
+++ b/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java
@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.QueryException;
 import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
@@ -33,7 +33,7 @@ public class NativeSQLQueryPlan implements Serializable {
 
 	private final SQLCustomQuery customQuery;
 
-	private static final Log log = LogFactory.getLog(NativeSQLQueryPlan.class);
+	private static final Logger log = LoggerFactory.getLogger(NativeSQLQueryPlan.class);
 
 	public NativeSQLQueryPlan(
 			NativeSQLQuerySpecification specification,
diff --git a/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java b/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
index 053a62bad2..79d518bce1 100644
--- a/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
+++ b/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
@@ -7,8 +7,8 @@ import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
 import org.hibernate.QueryException;
 import org.hibernate.MappingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -26,7 +26,7 @@ import java.util.Collections;
  */
 public class QueryPlanCache implements Serializable {
 
-	private static final Log log = LogFactory.getLog( QueryPlanCache.class );
+	private static final Logger log = LoggerFactory.getLogger( QueryPlanCache.class );
 
 	private SessionFactoryImplementor factory;
 
diff --git a/core/src/main/java/org/hibernate/engine/transaction/Isolater.java b/core/src/main/java/org/hibernate/engine/transaction/Isolater.java
index a9e80fd05d..78a7fcf9d6 100644
--- a/core/src/main/java/org/hibernate/engine/transaction/Isolater.java
+++ b/core/src/main/java/org/hibernate/engine/transaction/Isolater.java
@@ -5,8 +5,8 @@ import java.sql.SQLException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.exception.JDBCExceptionHelper;
@@ -24,7 +24,7 @@ import org.hibernate.exception.JDBCExceptionHelper;
  */
 public class Isolater {
 
-	private static final Log log = LogFactory.getLog( Isolater.class );
+	private static final Logger log = LoggerFactory.getLogger( Isolater.class );
 
 	/**
 	 * Ensures that all processing actually performed by the given work will
diff --git a/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java b/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java
index c0036be8ea..312fa32813 100644
--- a/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java
@@ -6,8 +6,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.action.CollectionRecreateAction;
 import org.hibernate.action.CollectionRemoveAction;
@@ -39,7 +39,7 @@ import org.hibernate.util.LazyIterator;
  */
 public abstract class AbstractFlushingEventListener implements Serializable {
 
-	private static final Log log = LogFactory.getLog(AbstractFlushingEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(AbstractFlushingEventListener.class);
 	
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Pre-flushing section
diff --git a/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java b/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java
index b989249bda..1fb3e80b74 100644
--- a/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java
@@ -1,8 +1,8 @@
 //$Id: AbstractLockUpgradeEventListener.java 11398 2007-04-10 14:54:07Z steve.ebersole@jboss.com $
 package org.hibernate.event.def;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.LockMode;
 import org.hibernate.ObjectDeletedException;
@@ -22,7 +22,7 @@ import org.hibernate.pretty.MessageHelper;
  */
 public class AbstractLockUpgradeEventListener extends AbstractReassociateEventListener {
 
-	private static final Log log = LogFactory.getLog(AbstractLockUpgradeEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(AbstractLockUpgradeEventListener.class);
 
 	/**
 	 * Performs a pessimistic lock upgrade on a given entity, if needed.
diff --git a/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java b/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java
index 47f4dda826..171a28a8f7 100644
--- a/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.LockMode;
 import org.hibernate.engine.EntityEntry;
@@ -25,7 +25,7 @@ import org.hibernate.type.TypeFactory;
  */
 public class AbstractReassociateEventListener implements Serializable {
 
-	private static final Log log = LogFactory.getLog( AbstractReassociateEventListener.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractReassociateEventListener.class );
 
 	/**
 	 * Associates a given entity (either transient or associated with another session) to
diff --git a/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java b/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java
index 846e3d889d..5b00b0c487 100644
--- a/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java
@@ -4,8 +4,8 @@ package org.hibernate.event.def;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.LockMode;
 import org.hibernate.NonUniqueObjectException;
@@ -44,7 +44,7 @@ public abstract class AbstractSaveEventListener extends AbstractReassociateEvent
 	protected static final int DETACHED = 2;
 	protected static final int DELETED = 3;
 
-	private static final Log log = LogFactory.getLog( AbstractSaveEventListener.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractSaveEventListener.class );
 
 	/**
 	 * Prepares the save call using the given requested id.
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java
index c9a4e9f56f..914c2a7783 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java
@@ -1,8 +1,8 @@
 //$Id: DefaultAutoFlushEventListener.java 7785 2005-08-08 23:24:44Z oneovthafew $
 package org.hibernate.event.def;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.event.AutoFlushEvent;
@@ -17,7 +17,7 @@ import org.hibernate.event.EventSource;
  */
 public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener implements AutoFlushEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultAutoFlushEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultAutoFlushEventListener.class);
 
     /** Handle the given auto-flush event.
      *
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java
index a0fd06c749..8ecbfbb39c 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java
@@ -4,8 +4,8 @@ package org.hibernate.event.def;
 import java.io.Serializable;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.CacheMode;
 import org.hibernate.HibernateException;
@@ -39,7 +39,7 @@ import org.hibernate.type.TypeFactory;
  */
 public class DefaultDeleteEventListener implements DeleteEventListener {
 
-	private static final Log log = LogFactory.getLog( DefaultDeleteEventListener.class );
+	private static final Logger log = LoggerFactory.getLogger( DefaultDeleteEventListener.class );
 
 	/**
 	 * Handle the given delete event.
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java
index f8814daca9..95c452f5d7 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java
@@ -4,8 +4,8 @@ package org.hibernate.event.def;
 import org.hibernate.HibernateException;
 import org.hibernate.event.DirtyCheckEvent;
 import org.hibernate.event.DirtyCheckEventListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines the default dirty-check event listener used by hibernate for
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DefaultDirtyCheckEventListener extends AbstractFlushingEventListener implements DirtyCheckEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultDirtyCheckEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultDirtyCheckEventListener.class);
 
     /** Handle the given dirty-check event.
      *
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java
index bf77d956ba..517b7e1712 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.Cascade;
 import org.hibernate.engine.CascadingAction;
@@ -29,7 +29,7 @@ import org.hibernate.proxy.LazyInitializer;
  */
 public class DefaultEvictEventListener implements EvictEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultEvictEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultEvictEventListener.class);
 
 	/** 
 	 * Handle the given evict event.
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java
index b79d607e5b..5ad5a522f2 100755
--- a/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
@@ -34,7 +34,7 @@ import org.hibernate.util.ArrayHelper;
  */
 public class DefaultFlushEntityEventListener implements FlushEntityEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultFlushEntityEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultFlushEntityEventListener.class);
 
 	/**
 	 * make sure user didn't mangle the id
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java
index a934609e1c..2e4cfaa3f4 100755
--- a/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cache.CacheKey;
 import org.hibernate.cache.entry.CollectionCacheEntry;
@@ -23,7 +23,7 @@ import org.hibernate.pretty.MessageHelper;
  */
 public class DefaultInitializeCollectionEventListener implements InitializeCollectionEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultInitializeCollectionEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultInitializeCollectionEventListener.class);
 
 	/**
 	 * called by a collection that wants to initialize itself
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
index 92b60692bc..64ca1c1d14 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.NonUniqueObjectException;
@@ -46,7 +46,7 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
 	public static final Object INCONSISTENT_RTN_CLASS_MARKER = new Object();
 	public static final LockMode DEFAULT_LOCK_MODE = LockMode.NONE;
 
-	private static final Log log = LogFactory.getLog(DefaultLoadEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultLoadEventListener.class);
 
 
 	/**
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java
index b134cb5ee6..9302d73a39 100755
--- a/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java
@@ -4,8 +4,8 @@ package org.hibernate.event.def;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.ObjectDeletedException;
@@ -37,7 +37,7 @@ import org.hibernate.util.IdentityMap;
 public class DefaultMergeEventListener extends AbstractSaveEventListener 
 	implements MergeEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultMergeEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultMergeEventListener.class);
 	
 	protected Map getMergeMap(Object anything) {
 		return IdentityMap.invert( (Map) anything );
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java
index 2d4afa1b50..09a0d9f618 100755
--- a/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.ObjectDeletedException;
 import org.hibernate.PersistentObjectException;
@@ -26,7 +26,7 @@ import org.hibernate.util.IdentityMap;
  */
 public class DefaultPersistEventListener extends AbstractSaveEventListener implements PersistEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultPersistEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultPersistEventListener.class);
 
 	/** 
 	 * Handle the given create event.
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java
index bf569b50a6..29756062e1 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java
@@ -4,8 +4,8 @@ package org.hibernate.event.def;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.PersistentObjectException;
 import org.hibernate.UnresolvableObjectException;
@@ -33,7 +33,7 @@ import org.hibernate.util.IdentityMap;
  */
 public class DefaultRefreshEventListener implements RefreshEventListener {
 
-	private static final Log log = LogFactory.getLog(DefaultRefreshEventListener.class);
+	private static final Logger log = LoggerFactory.getLogger(DefaultRefreshEventListener.class);
 	
 	public void onRefresh(RefreshEvent event) throws HibernateException {
 		onRefresh( event, IdentityMap.instantiate(10) );
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java
index 9138d2005f..0c7c2d8a36 100644
--- a/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java
@@ -19,8 +19,8 @@ import org.hibernate.type.Type;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines the default replicate event listener used by Hibernate to replicate
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DefaultReplicateEventListener extends AbstractSaveEventListener implements ReplicateEventListener {
 
-	private static final Log log = LogFactory.getLog( DefaultReplicateEventListener.class );
+	private static final Logger log = LoggerFactory.getLogger( DefaultReplicateEventListener.class );
 
 	/**
 	 * Handle the given replicate event.
diff --git a/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java b/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java
index 60d6c08452..11da2ff649 100755
--- a/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java
+++ b/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
@@ -36,7 +36,7 @@ import org.hibernate.proxy.HibernateProxy;
  */
 public class DefaultSaveOrUpdateEventListener extends AbstractSaveEventListener implements SaveOrUpdateEventListener {
 
-	private static final Log log = LogFactory.getLog( DefaultSaveOrUpdateEventListener.class );
+	private static final Logger log = LoggerFactory.getLogger( DefaultSaveOrUpdateEventListener.class );
 
 	/**
 	 * Handle the given update event.
diff --git a/core/src/main/java/org/hibernate/event/def/EvictVisitor.java b/core/src/main/java/org/hibernate/event/def/EvictVisitor.java
index 3e11f84226..c0c535aee0 100644
--- a/core/src/main/java/org/hibernate/event/def/EvictVisitor.java
+++ b/core/src/main/java/org/hibernate/event/def/EvictVisitor.java
@@ -1,8 +1,8 @@
 //$Id: EvictVisitor.java 6929 2005-05-27 03:54:08Z oneovthafew $
 package org.hibernate.event.def;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.collection.PersistentCollection;
 import org.hibernate.engine.CollectionEntry;
@@ -20,7 +20,7 @@ import org.hibernate.type.CollectionType;
  */
 public class EvictVisitor extends AbstractVisitor {
 	
-	private static final Log log = LogFactory.getLog(EvictVisitor.class);
+	private static final Logger log = LoggerFactory.getLogger(EvictVisitor.class);
 
 	EvictVisitor(EventSource session) {
 		super(session);
diff --git a/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java b/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java
index 8cdcd00842..072342710d 100644
--- a/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java
+++ b/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java
@@ -3,8 +3,8 @@ package org.hibernate.event.def;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.action.CollectionRemoveAction;
 import org.hibernate.event.EventSource;
@@ -20,7 +20,7 @@ import org.hibernate.type.Type;
  */
 public abstract class ReattachVisitor extends ProxyVisitor {
 
-	private static final Log log = LogFactory.getLog( ReattachVisitor.class );
+	private static final Logger log = LoggerFactory.getLogger( ReattachVisitor.class );
 
 	private final Serializable ownerIdentifier;
 	private final Object owner;
diff --git a/core/src/main/java/org/hibernate/event/def/WrapVisitor.java b/core/src/main/java/org/hibernate/event/def/WrapVisitor.java
index ddfb73f399..3eec317d8e 100644
--- a/core/src/main/java/org/hibernate/event/def/WrapVisitor.java
+++ b/core/src/main/java/org/hibernate/event/def/WrapVisitor.java
@@ -1,8 +1,8 @@
 //$Id: WrapVisitor.java 7181 2005-06-17 19:36:08Z oneovthafew $
 package org.hibernate.event.def;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.collection.PersistentCollection;
@@ -22,7 +22,7 @@ import org.hibernate.type.Type;
  */
 public class WrapVisitor extends ProxyVisitor {
 
-	private static final Log log = LogFactory.getLog(WrapVisitor.class);
+	private static final Logger log = LoggerFactory.getLogger(WrapVisitor.class);
 
 	boolean substitute = false;
 
diff --git a/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java b/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java
index 10b6f78218..4d2efd92e0 100644
--- a/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java
+++ b/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java
@@ -1,8 +1,8 @@
 // $Id: SQLExceptionConverterFactory.java 4782 2004-11-21 00:11:27Z pgmjsd $
 package org.hibernate.exception;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.cfg.Environment;
@@ -21,7 +21,7 @@ import java.util.Properties;
  */
 public class SQLExceptionConverterFactory {
 
-	private static final Log log = LogFactory.getLog( SQLExceptionConverterFactory.class );
+	private static final Logger log = LoggerFactory.getLogger( SQLExceptionConverterFactory.class );
 
 	private SQLExceptionConverterFactory() {
 		// Private constructor - stops checkstyle from complaining.
diff --git a/core/src/main/java/org/hibernate/hql/QuerySplitter.java b/core/src/main/java/org/hibernate/hql/QuerySplitter.java
index a681d398d0..01251a58f7 100644
--- a/core/src/main/java/org/hibernate/hql/QuerySplitter.java
+++ b/core/src/main/java/org/hibernate/hql/QuerySplitter.java
@@ -1,8 +1,8 @@
 //$Id: QuerySplitter.java 7646 2005-07-25 07:37:13Z oneovthafew $
 package org.hibernate.hql;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.hql.classic.ParserHelper;
@@ -21,7 +21,7 @@ import java.util.Set;
  */
 public final class QuerySplitter {
 
-	private static final Log log = LogFactory.getLog( QuerySplitter.class );
+	private static final Logger log = LoggerFactory.getLogger( QuerySplitter.class );
 
 	private static final Set BEFORE_CLASS_TOKENS = new HashSet();
 	private static final Set NOT_AFTER_CLASS_TOKENS = new HashSet();
diff --git a/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java b/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java
index 68cb6def03..12153c100d 100755
--- a/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java
+++ b/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java
@@ -1,8 +1,8 @@
 //$Id: ASTQueryTranslatorFactory.java 9162 2006-01-27 23:40:32Z steveebersole $
 package org.hibernate.hql.ast;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.hql.FilterTranslator;
 import org.hibernate.hql.QueryTranslator;
@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public class ASTQueryTranslatorFactory implements QueryTranslatorFactory {
 
-	private static final Log log = LogFactory.getLog( ASTQueryTranslatorFactory.class );
+	private static final Logger log = LoggerFactory.getLogger( ASTQueryTranslatorFactory.class );
 
 	public ASTQueryTranslatorFactory() {
 		log.info( "Using ASTQueryTranslatorFactory" );
diff --git a/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java b/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java
index e4844c48a1..316449860e 100644
--- a/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java
+++ b/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java
@@ -2,8 +2,8 @@
 package org.hibernate.hql.ast;
 
 import antlr.RecognitionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.QueryException;
 
 import java.util.ArrayList;
@@ -14,8 +14,8 @@ import java.util.List;
  * An error handler that counts parsing errors and warnings.
  */
 public class ErrorCounter implements ParseErrorHandler {
-	private Log log = LogFactory.getLog( ErrorCounter.class );
-	private Log hqlLog = LogFactory.getLog( "org.hibernate.hql.PARSER" );
+	private Logger log = LoggerFactory.getLogger( ErrorCounter.class );
+	private Logger hqlLog = LoggerFactory.getLogger( "org.hibernate.hql.PARSER" );
 
 	private List errorList = new ArrayList();
 	private List warningList = new ArrayList();
@@ -25,7 +25,7 @@ public class ErrorCounter implements ParseErrorHandler {
 		reportError( e.toString() );
 		recognitionExceptions.add( e );
 		if ( log.isDebugEnabled() ) {
-			log.debug( e, e );
+			log.debug( e.toString(), e );
 		}
 	}
 
diff --git a/core/src/main/java/org/hibernate/hql/ast/HqlParser.java b/core/src/main/java/org/hibernate/hql/ast/HqlParser.java
index 10980b4e41..375b93e554 100644
--- a/core/src/main/java/org/hibernate/hql/ast/HqlParser.java
+++ b/core/src/main/java/org/hibernate/hql/ast/HqlParser.java
@@ -12,8 +12,8 @@ import antlr.Token;
 import antlr.TokenStream;
 import antlr.TokenStreamException;
 import antlr.collections.AST;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.hql.antlr.HqlBaseParser;
 import org.hibernate.hql.antlr.HqlTokenTypes;
 import org.hibernate.hql.ast.util.ASTPrinter;
@@ -30,7 +30,7 @@ public final class HqlParser extends HqlBaseParser {
 	/**
 	 * A logger for this class.
 	 */
-	private static final Log log = LogFactory.getLog( HqlParser.class );
+	private static final Logger log = LoggerFactory.getLogger( HqlParser.class );
 
 	private ParseErrorHandler parseErrorHandler;
 	private ASTPrinter printer = getASTPrinter();
diff --git a/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java b/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
index 8ccbb9f8b2..9cf0de6cda 100644
--- a/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
+++ b/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
@@ -11,8 +11,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.QueryException;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.JoinSequence;
@@ -88,7 +88,7 @@ import antlr.collections.AST;
  * @see SqlASTFactory
  */
 public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, ParameterBinder.NamedParameterSource {
-	private static final Log log = LogFactory.getLog( HqlSqlWalker.class );
+	private static final Logger log = LoggerFactory.getLogger( HqlSqlWalker.class );
 
 	private final QueryTranslatorImpl queryTranslatorImpl;
 	private final HqlParser hqlParser;
diff --git a/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java b/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java
index 2ab1cbf257..91b7bd20bd 100644
--- a/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java
+++ b/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java
@@ -5,8 +5,8 @@ import antlr.ANTLRException;
 import antlr.RecognitionException;
 import antlr.TokenStreamException;
 import antlr.collections.AST;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.QueryException;
@@ -54,8 +54,8 @@ import java.util.ArrayList;
  */
 public class QueryTranslatorImpl implements FilterTranslator {
 
-	private static final Log log = LogFactory.getLog( QueryTranslatorImpl.class );
-	private static final Log AST_LOG = LogFactory.getLog( "org.hibernate.hql.ast.AST" );
+	private static final Logger log = LoggerFactory.getLogger( QueryTranslatorImpl.class );
+	private static final Logger AST_LOG = LoggerFactory.getLogger( "org.hibernate.hql.ast.AST" );
 
 	private SessionFactoryImplementor factory;
 
diff --git a/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java b/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
index fbfb1c562d..e4a64f54ac 100644
--- a/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java
@@ -23,7 +23,7 @@ import org.hibernate.util.StringHelper;
 import antlr.RecognitionException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Implementation of AbstractStatementExecutor.
@@ -32,10 +32,10 @@ import org.apache.commons.logging.Log;
  */
 public abstract class AbstractStatementExecutor implements StatementExecutor {
 
-	private final Log log;
+	private final Logger log;
 	private final HqlSqlWalker walker;
 
-	public AbstractStatementExecutor(HqlSqlWalker walker, Log log) {
+	public AbstractStatementExecutor(HqlSqlWalker walker, Logger log) {
 		this.walker = walker;
 		this.log = log;
 	}
diff --git a/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java b/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java
index 6f62a7251a..0cb6f587a4 100644
--- a/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java
@@ -18,8 +18,8 @@ import org.hibernate.persister.entity.Queryable;
 
 import antlr.RecognitionException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of BasicExecutor.
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Steve Ebersole
  */
 public class BasicExecutor extends AbstractStatementExecutor {
-	private static final Log log = LogFactory.getLog( BasicExecutor.class );
+	private static final Logger log = LoggerFactory.getLogger( BasicExecutor.class );
 
 	private final Queryable persister;
 	private final String sql;
diff --git a/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java b/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java
index 234af2298a..f401c657f3 100644
--- a/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java
@@ -17,8 +17,8 @@ import org.hibernate.persister.entity.Queryable;
 import org.hibernate.sql.Delete;
 import org.hibernate.util.StringHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of MultiTableDeleteExecutor.
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Steve Ebersole
  */
 public class MultiTableDeleteExecutor extends AbstractStatementExecutor {
-	private static final Log log = LogFactory.getLog( MultiTableDeleteExecutor.class );
+	private static final Logger log = LoggerFactory.getLogger( MultiTableDeleteExecutor.class );
 
 	private final Queryable persister;
 	private final String idInsertSelect;
diff --git a/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java b/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
index 1d0eae2374..ddb5fe6dea 100644
--- a/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java
@@ -20,8 +20,8 @@ import org.hibernate.persister.entity.Queryable;
 import org.hibernate.sql.Update;
 import org.hibernate.util.StringHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of MultiTableUpdateExecutor.
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Steve Ebersole
  */
 public class MultiTableUpdateExecutor extends AbstractStatementExecutor {
-	private static final Log log = LogFactory.getLog( MultiTableUpdateExecutor.class );
+	private static final Logger log = LoggerFactory.getLogger( MultiTableUpdateExecutor.class );
 
 	private final Queryable persister;
 	private final String idInsertSelect;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java b/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java
index ed795720e1..378546b265 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java
@@ -6,7 +6,7 @@ import org.hibernate.hql.ast.util.ASTUtil;
 
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Convenience implementation of RestrictableStatement to centralize common functionality.
@@ -19,7 +19,7 @@ public abstract class AbstractRestrictableStatement extends AbstractStatement im
 	private AST whereClause;
 
 	protected abstract int getWhereClauseParentTokenType();
-	protected abstract Log getLog();
+	protected abstract Logger getLog();
 
 	/**
 	 * @see org.hibernate.hql.ast.tree.RestrictableStatement#getFromClause
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java b/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java
index d8ef073193..fd229bc990 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java
@@ -4,8 +4,8 @@ package org.hibernate.hql.ast.tree;
 import org.hibernate.hql.antlr.HqlSqlTokenTypes;
 import org.hibernate.hql.antlr.SqlTokenTypes;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines a top-level AST node representing an HQL delete statement.
@@ -14,7 +14,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DeleteStatement extends AbstractRestrictableStatement {
 
-	private static final Log log = LogFactory.getLog( DeleteStatement.class );
+	private static final Logger log = LoggerFactory.getLogger( DeleteStatement.class );
 
 	/**
 	 * @see org.hibernate.hql.ast.tree.Statement#getStatementType()
@@ -34,7 +34,7 @@ public class DeleteStatement extends AbstractRestrictableStatement {
 		return SqlTokenTypes.FROM;
 	}
 
-	protected Log getLog() {
+	protected Logger getLog() {
 		return log;
 	}
 }
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java b/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java
index d8b92bfd06..45b3046c4b 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java
@@ -19,8 +19,8 @@ import org.hibernate.util.StringHelper;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a reference to a property or alias expression.  This should duplicate the relevant behaviors in
@@ -49,7 +49,7 @@ public class DotNode extends FromReferenceNode implements DisplayableNode, Selec
 	public static IllegalCollectionDereferenceExceptionBuilder ILLEGAL_COLL_DEREF_EXCP_BUILDER = DEF_ILLEGAL_COLL_DEREF_EXCP_BUILDER;
 	///////////////////////////////////////////////////////////////////////////
 
-	private static final Log log = LogFactory.getLog( DotNode.class );
+	private static final Logger log = LoggerFactory.getLogger( DotNode.class );
 
 	private static final int DEREF_UNKNOWN = 0;
 	private static final int DEREF_ENTITY = 1;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java b/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java
index bb8a4c4fef..a06e5f88ee 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java
@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.hql.antlr.HqlSqlTokenTypes;
 import org.hibernate.hql.ast.util.ASTIterator;
 import org.hibernate.hql.ast.util.ASTUtil;
@@ -24,7 +24,7 @@ import antlr.collections.AST;
  * @author josh
  */
 public class FromClause extends HqlSqlWalkerNode implements HqlSqlTokenTypes, DisplayableNode {
-	private static Log log = LogFactory.getLog( FromClause.class );
+	private static Logger log = LoggerFactory.getLogger( FromClause.class );
 	public static final int ROOT_LEVEL = 1;
 
 	private int level = ROOT_LEVEL;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java b/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java
index 7dd8a0071b..51e4c2dab3 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java
@@ -19,8 +19,8 @@ import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 import org.hibernate.util.StringHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a single mapped class mentioned in an HQL FROM clause.  Each
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory;
  * Time: 10:28:17 AM<br>
  */
 public class FromElement extends HqlSqlWalkerNode implements DisplayableNode {
-	private static final Log log = LogFactory.getLog( FromElement.class );
+	private static final Logger log = LoggerFactory.getLogger( FromElement.class );
 
 	private String className;
 	private String classAlias;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java b/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java
index d791c0a738..1900da3e58 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java
@@ -22,8 +22,8 @@ import antlr.ASTFactory;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Encapsulates the creation of FromElements and JoinSequences.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
  */
 class FromElementFactory implements SqlTokenTypes {
 
-	private static final Log log = LogFactory.getLog( FromElementFactory.class );
+	private static final Logger log = LoggerFactory.getLogger( FromElementFactory.class );
 
 	private FromClause fromClause;
 	private FromElement origin;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java b/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java
index 209bb24860..f813c222a7 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java
@@ -21,8 +21,8 @@ import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Delegate that handles the type and join sequence information for a FromElement.
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
  * @author josh Feb 12, 2005 10:17:34 AM
  */
 class FromElementType {
-	private static final Log log = LogFactory.getLog( FromElementType.class );
+	private static final Logger log = LoggerFactory.getLogger( FromElementType.class );
 
 	private FromElement fromElement;
 	private EntityType entityType;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java b/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java
index c0dbafc929..c36445b9c7 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java
@@ -4,8 +4,8 @@ package org.hibernate.hql.ast.tree;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a reference to a FROM element, for example a class alias in a WHERE clause.
@@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory;
 public abstract class FromReferenceNode extends AbstractSelectExpression
         implements ResolvableNode, DisplayableNode, InitializeableNode, PathNode {
 
-	private static final Log log = LogFactory.getLog( FromReferenceNode.class );
+	private static final Logger log = LoggerFactory.getLogger( FromReferenceNode.class );
 
 	private FromElement fromElement;
 	private boolean resolved = false;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java b/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java
index 05985adaac..8a46221829 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java
@@ -13,8 +13,8 @@ import antlr.RecognitionException;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents the [] operator and provides it's semantics.
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class IndexNode extends FromReferenceNode {
 
-	private static final Log log = LogFactory.getLog( IndexNode.class );
+	private static final Logger log = LoggerFactory.getLogger( IndexNode.class );
 
 	public void setScalarColumnText(int i) throws SemanticException {
 		throw new UnsupportedOperationException( "An IndexNode cannot generate column text!" );
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java b/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java
index 3912f79bc5..d300c62145 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java
@@ -15,8 +15,8 @@ import org.hibernate.type.Type;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a method call.
@@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class MethodNode extends AbstractSelectExpression implements SelectExpression {
 
-	private static final Log log = LogFactory.getLog( MethodNode.class );
+	private static final Logger log = LoggerFactory.getLogger( MethodNode.class );
 
 	private String methodName;
 	private FromElement fromElement;
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java b/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java
index 8c48873bb6..767bf66b6c 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java
@@ -10,8 +10,8 @@ import org.hibernate.type.Type;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines a top-level AST node representing an HQL select statement.
@@ -20,7 +20,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class QueryNode extends AbstractRestrictableStatement implements SelectExpression {
 
-	private static final Log log = LogFactory.getLog( QueryNode.class );
+	private static final Logger log = LoggerFactory.getLogger( QueryNode.class );
 
 	private OrderByClause orderByClause;
 
@@ -42,7 +42,7 @@ public class QueryNode extends AbstractRestrictableStatement implements SelectEx
 		return SqlTokenTypes.FROM;
 	}
 
-	protected Log getLog() {
+	protected Logger getLog() {
 		return log;
 	}
 
diff --git a/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java b/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java
index d1781aee5b..244af19095 100644
--- a/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java
+++ b/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java
@@ -7,8 +7,8 @@ import org.hibernate.hql.ast.util.ASTUtil;
 
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines a top-level AST node representing an HQL update statement.
@@ -17,7 +17,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class UpdateStatement extends AbstractRestrictableStatement {
 
-	private static final Log log = LogFactory.getLog( UpdateStatement.class );
+	private static final Logger log = LoggerFactory.getLogger( UpdateStatement.class );
 
 	/**
 	 * @see org.hibernate.hql.ast.tree.Statement#getStatementType()
@@ -37,7 +37,7 @@ public class UpdateStatement extends AbstractRestrictableStatement {
 		return SqlTokenTypes.SET;
 	}
 
-	protected Log getLog() {
+	protected Logger getLog() {
 		return log;
 	}
 
diff --git a/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java b/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java
index 54e965bff7..08a347e133 100644
--- a/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java
@@ -20,8 +20,8 @@ import org.hibernate.util.StringHelper;
 
 import antlr.ASTFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Performs the post-processing of the join information gathered during semantic analysis.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class JoinProcessor implements SqlTokenTypes {
 
-	private static final Log log = LogFactory.getLog( JoinProcessor.class );
+	private static final Logger log = LoggerFactory.getLogger( JoinProcessor.class );
 
 	private QueryTranslatorImpl queryTranslatorImpl;
 	private SyntheticAndFactory andFactory;
diff --git a/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java b/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java
index 4770aa3c46..e430673b2a 100644
--- a/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java
+++ b/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java
@@ -23,8 +23,8 @@ import org.hibernate.util.ReflectHelper;
 import antlr.SemanticException;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -53,7 +53,7 @@ public class LiteralProcessor implements HqlSqlTokenTypes {
 	 */
 	public static int DECIMAL_LITERAL_FORMAT = EXACT;
 
-	private static final Log log = LogFactory.getLog( LiteralProcessor.class );
+	private static final Logger log = LoggerFactory.getLogger( LiteralProcessor.class );
 
 	private HqlSqlWalker walker;
 
diff --git a/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java b/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java
index 4ab2d8b123..29e569b405 100644
--- a/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java
+++ b/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java
@@ -7,8 +7,8 @@ import org.hibernate.util.StringHelper;
 import antlr.ASTFactory;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides utility methods for paths.
@@ -17,7 +17,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public final class PathHelper {
 
-	private static final Log log = LogFactory.getLog( PathHelper.class );
+	private static final Logger log = LoggerFactory.getLogger( PathHelper.class );
 
 	private PathHelper() {
 	}
diff --git a/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java b/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java
index eda6686bb9..037071f590 100644
--- a/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java
+++ b/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java
@@ -16,8 +16,8 @@ import org.hibernate.util.StringHelper;
 import antlr.ASTFactory;
 import antlr.collections.AST;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Creates synthetic and nodes based on the where fragment part of a JoinSequence.
@@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory;
  * @author josh Dec 5, 2004 12:25:20 PM
  */
 public class SyntheticAndFactory implements HqlSqlTokenTypes {
-	private static final Log log = LogFactory.getLog( SyntheticAndFactory.class );
+	private static final Logger log = LoggerFactory.getLogger( SyntheticAndFactory.class );
 
 	private ASTFactory astFactory;
 	private AST thetaJoins;
diff --git a/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java b/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java
index 45f5bcb95a..5053880e83 100644
--- a/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java
+++ b/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
@@ -116,7 +116,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 	private Map enabledFilters;
 
-	private static final Log log = LogFactory.getLog( QueryTranslatorImpl.class );
+	private static final Logger log = LoggerFactory.getLogger( QueryTranslatorImpl.class );
 
 	/**
 	 * Construct a query translator
diff --git a/core/src/main/java/org/hibernate/id/GUIDGenerator.java b/core/src/main/java/org/hibernate/id/GUIDGenerator.java
index d282238bf6..480e9d9a7c 100644
--- a/core/src/main/java/org/hibernate/id/GUIDGenerator.java
+++ b/core/src/main/java/org/hibernate/id/GUIDGenerator.java
@@ -6,8 +6,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.exception.JDBCExceptionHelper;
@@ -19,7 +19,7 @@ import org.hibernate.exception.JDBCExceptionHelper;
  */
 public class GUIDGenerator implements IdentifierGenerator {
 
-	private static final Log log = LogFactory.getLog(GUIDGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(GUIDGenerator.class);
 
 	public Serializable generate(SessionImplementor session, Object obj) 
 	throws HibernateException {
diff --git a/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java b/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java
index 34476e5bf4..2c646797d4 100644
--- a/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java
+++ b/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java
@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.dialect.Dialect;
@@ -22,7 +22,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public final class IdentifierGeneratorFactory {
 	
-	private static final Log log = LogFactory.getLog(IdentifierGeneratorFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(IdentifierGeneratorFactory.class);
 
 	/**
 	 * Get the generated identifier when using identity columns
diff --git a/core/src/main/java/org/hibernate/id/IncrementGenerator.java b/core/src/main/java/org/hibernate/id/IncrementGenerator.java
index 768550c69d..82dd59472e 100644
--- a/core/src/main/java/org/hibernate/id/IncrementGenerator.java
+++ b/core/src/main/java/org/hibernate/id/IncrementGenerator.java
@@ -6,8 +6,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.dialect.Dialect;
@@ -31,7 +31,7 @@ import org.hibernate.util.StringHelper;
  */
 public class IncrementGenerator implements IdentifierGenerator, Configurable {
 
-	private static final Log log = LogFactory.getLog(IncrementGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(IncrementGenerator.class);
 
 	private long next;
 	private String sql;
diff --git a/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java b/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
index 2211972048..646cb4985c 100644
--- a/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
+++ b/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
@@ -9,8 +9,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
@@ -56,7 +56,7 @@ public class MultipleHiLoPerTableGenerator
 	extends TransactionHelper
 	implements PersistentIdentifierGenerator, Configurable {
 	
-	private static final Log log = LogFactory.getLog(MultipleHiLoPerTableGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(MultipleHiLoPerTableGenerator.class);
 	
 	public static final String ID_TABLE = "table";
 	public static final String PK_COLUMN_NAME = "primary_key_column";
diff --git a/core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java b/core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
index 8bf5922a23..6d5da00da3 100644
--- a/core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
+++ b/core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
@@ -1,8 +1,8 @@
 //$Id: PersistentIdentifierGenerator.java 6514 2005-04-26 06:37:54Z oneovthafew $
 package org.hibernate.id;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 
@@ -69,7 +69,7 @@ public interface PersistentIdentifierGenerator extends IdentifierGenerator {
 	 */
 	public Object generatorKey();
 	
-	static final Log SQL = LogFactory.getLog("org.hibernate.SQL");
+	static final Logger SQL = LoggerFactory.getLogger( "org.hibernate.SQL" );
 
 }
 
diff --git a/core/src/main/java/org/hibernate/id/SequenceGenerator.java b/core/src/main/java/org/hibernate/id/SequenceGenerator.java
index b40c51afef..0f90ef2ac6 100644
--- a/core/src/main/java/org/hibernate/id/SequenceGenerator.java
+++ b/core/src/main/java/org/hibernate/id/SequenceGenerator.java
@@ -7,8 +7,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.exception.JDBCExceptionHelper;
@@ -49,7 +49,7 @@ public class SequenceGenerator implements PersistentIdentifierGenerator, Configu
 	private Type identifierType;
 	private String sql;
 
-	private static final Log log = LogFactory.getLog(SequenceGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(SequenceGenerator.class);
 
 	public void configure(Type type, Properties params, Dialect dialect) throws MappingException {
 		sequenceName = PropertiesHelper.getString(SEQUENCE, params, "hibernate_sequence");
diff --git a/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java b/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
index 341ac10840..16092aebec 100644
--- a/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
+++ b/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
@@ -4,8 +4,8 @@ package org.hibernate.id;
 import java.io.Serializable;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.dialect.Dialect;
@@ -32,7 +32,7 @@ public class SequenceHiLoGenerator extends SequenceGenerator {
 
 	public static final String MAX_LO = "max_lo";
 
-	private static final Log log = LogFactory.getLog(SequenceHiLoGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(SequenceHiLoGenerator.class);
 
 	private int maxLo;
 	private int lo;
diff --git a/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java b/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
index 6227ce6417..087b8a7d20 100644
--- a/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
+++ b/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
@@ -9,8 +9,8 @@ import org.hibernate.MappingException;
 import org.hibernate.sql.Insert;
 import org.hibernate.type.Type;
 import org.hibernate.engine.SessionImplementor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
@@ -33,7 +33,7 @@ import java.util.Properties;
 public class SequenceIdentityGenerator extends SequenceGenerator
 		implements PostInsertIdentifierGenerator {
 
-	private static final Log log = LogFactory.getLog( SequenceIdentityGenerator.class );
+	private static final Logger log = LoggerFactory.getLogger( SequenceIdentityGenerator.class );
 
 	public Serializable generate(SessionImplementor s, Object obj) {
 		return IdentifierGeneratorFactory.POST_INSERT_INDICATOR;
diff --git a/core/src/main/java/org/hibernate/id/TableGenerator.java b/core/src/main/java/org/hibernate/id/TableGenerator.java
index 53bb0f2448..628571a6c9 100644
--- a/core/src/main/java/org/hibernate/id/TableGenerator.java
+++ b/core/src/main/java/org/hibernate/id/TableGenerator.java
@@ -9,8 +9,8 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.dialect.Dialect;
@@ -56,7 +56,7 @@ public class TableGenerator extends TransactionHelper
 	/** Default table name */	
 	public static final String DEFAULT_TABLE_NAME = "hibernate_unique_key";
 
-	private static final Log log = LogFactory.getLog(TableGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(TableGenerator.class);
 
 	private String tableName;
 	private String columnName;
diff --git a/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java b/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
index 98305319c6..1ec1ebfed3 100644
--- a/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
+++ b/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
@@ -4,8 +4,8 @@ package org.hibernate.id;
 import java.io.Serializable;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.SessionImplementor;
@@ -41,7 +41,7 @@ public class TableHiLoGenerator extends TableGenerator {
 	private int maxLo;
 	private Class returnClass;
 
-	private static final Log log = LogFactory.getLog(TableHiLoGenerator.class);
+	private static final Logger log = LoggerFactory.getLogger(TableHiLoGenerator.class);
 
 	public void configure(Type type, Properties params, Dialect d) {
 		super.configure(type, params, d);
diff --git a/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
index f3e468605f..9ee126b915 100644
--- a/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
+++ b/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
@@ -3,8 +3,8 @@ package org.hibernate.id.enhanced;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.util.ReflectHelper;
@@ -16,7 +16,7 @@ import org.hibernate.id.IdentifierGeneratorFactory;
  * @author Steve Ebersole
  */
 public class OptimizerFactory {
-	private static final Log log = LogFactory.getLog( OptimizerFactory.class );
+	private static final Logger log = LoggerFactory.getLogger( OptimizerFactory.class );
 
 	public static final String NONE = "none";
 	public static final String HILO = "hilo";
diff --git a/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java b/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
index 2c4408147b..1a0516e55f 100644
--- a/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
+++ b/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java
@@ -4,8 +4,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.SessionImplementor;
@@ -18,7 +18,7 @@ import org.hibernate.HibernateException;
  * @author Steve Ebersole
  */
 public class SequenceStructure implements DatabaseStructure {
-	private static final Log log = LogFactory.getLog( SequenceStructure.class );
+	private static final Logger log = LoggerFactory.getLogger( SequenceStructure.class );
 
 	private final String sequenceName;
 	private final int initialValue;
diff --git a/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
index a0a89b095f..7d2eff9b44 100644
--- a/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
+++ b/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
@@ -3,8 +3,8 @@ package org.hibernate.id.enhanced;
 import java.util.Properties;
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.id.Configurable;
@@ -72,7 +72,7 @@ import org.hibernate.dialect.Dialect;
  * @author Steve Ebersole
  */
 public class SequenceStyleGenerator implements PersistentIdentifierGenerator, Configurable {
-	private static final Log log = LogFactory.getLog( SequenceStyleGenerator.class );
+	private static final Logger log = LoggerFactory.getLogger( SequenceStyleGenerator.class );
 
 	// general purpose parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	public static final String SEQUENCE_PARAM = "sequence_name";
diff --git a/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
index 598a33f9dd..2b7205cb6c 100644
--- a/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
+++ b/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
@@ -9,8 +9,8 @@ import java.util.Properties;
 import java.util.HashMap;
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.engine.TransactionHelper;
 import org.hibernate.engine.SessionImplementor;
@@ -87,7 +87,7 @@ import org.hibernate.util.CollectionHelper;
  * @author Steve Ebersole
  */
 public class TableGenerator extends TransactionHelper implements PersistentIdentifierGenerator, Configurable {
-	private static final Log log = LogFactory.getLog( TableGenerator.class );
+	private static final Logger log = LoggerFactory.getLogger( TableGenerator.class );
 
 	public static final String TABLE_PARAM = "table_name";
 	public static final String DEF_TABLE = "hibernate_sequences";
diff --git a/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
index 6df8ee925a..b57d36dde2 100644
--- a/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
+++ b/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java
@@ -7,8 +7,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.LockMode;
@@ -23,8 +23,8 @@ import org.hibernate.id.IdentifierGenerationException;
  * @author Steve Ebersole
  */
 public class TableStructure extends TransactionHelper implements DatabaseStructure {
-	private static final Log log = LogFactory.getLog( TableStructure.class );
-	private static final Log SQL_LOG = LogFactory.getLog( "org.hibernate.SQL" );
+	private static final Logger log = LoggerFactory.getLogger( TableStructure.class );
+	private static final Logger SQL_LOG = LoggerFactory.getLogger( "org.hibernate.SQL" );
 
 	private final String tableName;
 	private final String valueColumnName;
diff --git a/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java b/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java
index b078990ac2..266795afb2 100644
--- a/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java
+++ b/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java
@@ -13,8 +13,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
@@ -34,7 +34,7 @@ import org.hibernate.type.Type;
  */
 public abstract class AbstractScrollableResults implements ScrollableResults {
 
-	private static final Log log = LogFactory.getLog( AbstractScrollableResults.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractScrollableResults.class );
 
 	private final ResultSet resultSet;
 	private final PreparedStatement ps;
diff --git a/core/src/main/java/org/hibernate/impl/IteratorImpl.java b/core/src/main/java/org/hibernate/impl/IteratorImpl.java
index 84e5a1e317..730f9d6b0f 100644
--- a/core/src/main/java/org/hibernate/impl/IteratorImpl.java
+++ b/core/src/main/java/org/hibernate/impl/IteratorImpl.java
@@ -6,8 +6,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.engine.HibernateIterator;
@@ -24,7 +24,7 @@ import org.hibernate.type.Type;
  */
 public final class IteratorImpl implements HibernateIterator {
 
-	private static final Log log = LogFactory.getLog(IteratorImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(IteratorImpl.class);
 
 	private ResultSet rs;
 	private final EventSource session;
diff --git a/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java b/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
index e92db67c45..e981877e29 100644
--- a/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
+++ b/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
@@ -22,8 +22,8 @@ import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.EntityMode;
@@ -152,7 +152,7 @@ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryI
 
 	private static final IdentifierGenerator UUID_GENERATOR = new UUIDHexGenerator();
 
-	private static final Log log = LogFactory.getLog(SessionFactoryImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(SessionFactoryImpl.class);
 
 	public SessionFactoryImpl(
 			Configuration cfg,
diff --git a/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java b/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java
index 720b610721..6e3f133c6c 100644
--- a/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java
+++ b/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java
@@ -21,8 +21,8 @@ import org.hibernate.SessionFactory;
 import org.hibernate.util.FastHashMap;
 import org.hibernate.util.NamingHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Resolves <tt>SessionFactory</tt> JNDI lookups and deserialization
@@ -31,10 +31,10 @@ public class SessionFactoryObjectFactory implements ObjectFactory {
 
 	private static final SessionFactoryObjectFactory INSTANCE; //to stop the class from being unloaded
 
-	private static final Log log;
+	private static final Logger log;
 
 	static {
-		log = LogFactory.getLog(SessionFactoryObjectFactory.class);
+		log = LoggerFactory.getLogger( SessionFactoryObjectFactory.class );
 		INSTANCE = new SessionFactoryObjectFactory();
 		log.debug("initializing class SessionFactoryObjectFactory");
 	}
@@ -136,7 +136,7 @@ public class SessionFactoryObjectFactory implements ObjectFactory {
 		Object result = NAMED_INSTANCES.get(name);
 		if (result==null) {
 			log.debug("Not found: " + name);
-			log.debug(NAMED_INSTANCES);
+			log.debug( NAMED_INSTANCES.toString() );
 		}
 		return result;
 	}
@@ -146,7 +146,7 @@ public class SessionFactoryObjectFactory implements ObjectFactory {
 		Object result = INSTANCES.get(uid);
 		if (result==null) {
 			log.debug("Not found: " + uid);
-			log.debug(INSTANCES);
+			log.debug( INSTANCES.toString() );
 		}
 		return result;
 	}
diff --git a/core/src/main/java/org/hibernate/impl/SessionImpl.java b/core/src/main/java/org/hibernate/impl/SessionImpl.java
index 71aa1322c0..57449a61de 100644
--- a/core/src/main/java/org/hibernate/impl/SessionImpl.java
+++ b/core/src/main/java/org/hibernate/impl/SessionImpl.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.dom4j.Element;
 import org.hibernate.CacheMode;
 import org.hibernate.ConnectionReleaseMode;
@@ -119,7 +119,7 @@ public final class SessionImpl extends AbstractSessionImpl
 	// a seperate classs responsible for generating/dispatching events just duplicates most of the Session methods...
 	// passing around seperate reto interceptor, factory, actionQueue, and persistentContext is not manageable...
 
-	private static final Log log = LogFactory.getLog(SessionImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(SessionImpl.class);
 
 	private transient EntityMode entityMode = EntityMode.POJO;
 	private transient boolean autoClear; //for EJB3
diff --git a/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java b/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java
index 13941930d9..3f32bfb7ce 100755
--- a/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java
+++ b/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java
@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.CacheMode;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.Criteria;
@@ -57,7 +57,7 @@ import org.hibernate.util.CollectionHelper;
 public class StatelessSessionImpl extends AbstractSessionImpl
 		implements JDBCContext.Context, StatelessSession {
 
-	private static final Log log = LogFactory.getLog( StatelessSessionImpl.class );
+	private static final Logger log = LoggerFactory.getLogger( StatelessSessionImpl.class );
 
 	private JDBCContext jdbcContext;
 	private PersistenceContext temporaryPersistenceContext = new StatefulPersistenceContext( this );
diff --git a/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java b/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java
index d734fd3c2c..d72b2a9a3d 100644
--- a/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java
+++ b/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java
@@ -9,8 +9,8 @@ import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -35,8 +35,8 @@ public abstract class AbstractBatcher implements Batcher {
 	private int openPreparedStatementCount;
 	private int openResultSetCount;
 
-	protected static final Log log = LogFactory.getLog(AbstractBatcher.class);
-	protected static final Log SQL_LOG = LogFactory.getLog("org.hibernate.SQL");
+	protected static final Logger log = LoggerFactory.getLogger( AbstractBatcher.class );
+	protected static final Logger SQL_LOG = LoggerFactory.getLogger( "org.hibernate.SQL" );
 
 	private final ConnectionManager connectionManager;
 	private final SessionFactoryImplementor factory;
diff --git a/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java b/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java
index 1dc9189507..1fd03f206c 100644
--- a/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java
+++ b/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java
@@ -8,8 +8,8 @@ import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -27,7 +27,7 @@ import org.hibernate.util.JDBCExceptionReporter;
  */
 public class ConnectionManager implements Serializable {
 
-	private static final Log log = LogFactory.getLog( ConnectionManager.class );
+	private static final Logger log = LoggerFactory.getLogger( ConnectionManager.class );
 
 	public static interface Callback {
 		public void connectionOpened();
diff --git a/core/src/main/java/org/hibernate/jdbc/Expectations.java b/core/src/main/java/org/hibernate/jdbc/Expectations.java
index 2261fb8e5f..b6e7c525f6 100644
--- a/core/src/main/java/org/hibernate/jdbc/Expectations.java
+++ b/core/src/main/java/org/hibernate/jdbc/Expectations.java
@@ -1,7 +1,7 @@
 package org.hibernate.jdbc;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.StaleStateException;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.ExecuteUpdateResultCheckStyle;
@@ -19,7 +19,7 @@ import java.sql.Types;
  * @author Steve Ebersole
  */
 public class Expectations {
-	private static final Log log = LogFactory.getLog( Expectations.class );
+	private static final Logger log = LoggerFactory.getLogger( Expectations.class );
 
 	public static final int USUAL_EXPECTED_COUNT = 1;
 	public static final int USUAL_PARAM_POSITION = 1;
diff --git a/core/src/main/java/org/hibernate/jdbc/JDBCContext.java b/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
index c70bb34fd5..af08d5b509 100644
--- a/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
+++ b/core/src/main/java/org/hibernate/jdbc/JDBCContext.java
@@ -10,8 +10,8 @@ import java.sql.SQLException;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -40,7 +40,7 @@ public class JDBCContext implements Serializable, ConnectionManager.Callback {
 	// ConnectionManager is a "JDBCContext"?  A "SessionContext" should
 	// live in the impl package...
 
-	private static final Log log = LogFactory.getLog( JDBCContext.class );
+	private static final Logger log = LoggerFactory.getLogger( JDBCContext.class );
 
 	public static interface Context extends TransactionFactory.Context {
 		/**
diff --git a/core/src/main/java/org/hibernate/loader/Loader.java b/core/src/main/java/org/hibernate/loader/Loader.java
index 044a8bc795..be052e80b1 100644
--- a/core/src/main/java/org/hibernate/loader/Loader.java
+++ b/core/src/main/java/org/hibernate/loader/Loader.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
@@ -78,7 +78,7 @@ import org.hibernate.util.StringHelper;
  */
 public abstract class Loader {
 
-	private static final Log log = LogFactory.getLog( Loader.class );
+	private static final Logger log = LoggerFactory.getLogger( Loader.class );
 
 	private final SessionFactoryImplementor factory;
 	private ColumnNameCache columnNameCache;
diff --git a/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java b/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java
index bd8bf99002..b8a5e035b6 100644
--- a/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java
+++ b/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java
@@ -3,8 +3,8 @@ package org.hibernate.loader.collection;
 
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.loader.JoinWalker;
@@ -21,7 +21,7 @@ import org.hibernate.persister.collection.QueryableCollection;
  */
 public class BasicCollectionLoader extends CollectionLoader {
 
-	private static final Log log = LogFactory.getLog(BasicCollectionLoader.class);
+	private static final Logger log = LoggerFactory.getLogger(BasicCollectionLoader.class);
 
 	public BasicCollectionLoader(
 			QueryableCollection collectionPersister, 
diff --git a/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java b/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java
index bb4c3e2816..d505c296cf 100644
--- a/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java
+++ b/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java
@@ -3,8 +3,8 @@ package org.hibernate.loader.collection;
 
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.loader.JoinWalker;
@@ -21,7 +21,7 @@ import org.hibernate.persister.collection.QueryableCollection;
  */
 public class OneToManyLoader extends CollectionLoader {
 
-	private static final Log log = LogFactory.getLog(OneToManyLoader.class);
+	private static final Logger log = LoggerFactory.getLogger(OneToManyLoader.class);
 
 	public OneToManyLoader(
 			QueryableCollection oneToManyPersister, 
diff --git a/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java b/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java
index c0ec08608b..96aaeadc46 100755
--- a/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java
+++ b/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java
@@ -15,8 +15,8 @@ import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.loader.custom.CustomQuery;
 import org.hibernate.persister.collection.SQLLoadableCollection;
 import org.hibernate.persister.entity.SQLLoadable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implements Hibernate's built-in support for native SQL queries.
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class SQLCustomQuery implements CustomQuery {
 
-	public static final Log log = LogFactory.getLog( SQLCustomQuery.class );
+	public static final Logger log = LoggerFactory.getLogger( SQLCustomQuery.class );
 
 	private final String sql;
 	private final Set querySpaces = new HashSet();
diff --git a/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java b/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
index 51875b54eb..581e595821 100644
--- a/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
+++ b/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
@@ -36,8 +36,8 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.SQLLoadable;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for processing the series of {@link org.hibernate.engine.query.sql.NativeSQLQueryReturn returns}
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class SQLQueryReturnProcessor {
 
-	public static final Log log = LogFactory.getLog( SQLQueryReturnProcessor.class );
+	public static final Logger log = LoggerFactory.getLogger( SQLQueryReturnProcessor.class );
 
 	private NativeSQLQueryReturn[] queryReturns;
 
diff --git a/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java b/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
index 42f870483b..ad12920434 100755
--- a/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
+++ b/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.engine.SessionImplementor;
@@ -20,7 +20,7 @@ import org.hibernate.type.Type;
 public abstract class AbstractEntityLoader extends OuterJoinLoader 
 		implements UniqueEntityLoader {
 
-	protected static final Log log = LogFactory.getLog(EntityLoader.class);
+	protected static final Logger log = LoggerFactory.getLogger(EntityLoader.class);
 	protected final OuterJoinLoadable persister;
 	protected final Type uniqueKeyType;
 	protected final String entityName;
diff --git a/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java b/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
index 4f4eacb01c..e2306b040e 100755
--- a/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
+++ b/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
@@ -6,8 +6,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
@@ -28,7 +28,7 @@ import org.hibernate.util.ArrayHelper;
  */
 public class CollectionElementLoader extends OuterJoinLoader {
 	
-	private static final Log log = LogFactory.getLog(CollectionElementLoader.class);
+	private static final Logger log = LoggerFactory.getLogger(CollectionElementLoader.class);
 
 	private final OuterJoinLoadable persister;
 	private final Type keyType;
diff --git a/core/src/main/java/org/hibernate/mapping/RootClass.java b/core/src/main/java/org/hibernate/mapping/RootClass.java
index dcc7ac6694..a9b546d273 100644
--- a/core/src/main/java/org/hibernate/mapping/RootClass.java
+++ b/core/src/main/java/org/hibernate/mapping/RootClass.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.hibernate.MappingException;
 import org.hibernate.engine.Mapping;
 import org.hibernate.util.ReflectHelper;
@@ -207,12 +207,12 @@ public class RootClass extends PersistentClass implements TableOwner {
 			if ( !id.isDynamic() ) {
 				Class idClass = id.getComponentClass();
 				if ( idClass != null && !ReflectHelper.overridesEquals( idClass ) ) {
-					LogFactory.getLog(RootClass.class)
+					LoggerFactory.getLogger( RootClass.class )
 						.warn( "composite-id class does not override equals(): "
 							+ id.getComponentClass().getName() );
 				}
 				if ( !ReflectHelper.overridesHashCode( idClass ) ) {
-					LogFactory.getLog(RootClass.class)
+					LoggerFactory.getLogger( RootClass.class )
 						.warn( "composite-id class does not override hashCode(): "
 							+ id.getComponentClass().getName() );
 				}
diff --git a/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
index 4a85cb07a2..5ac518d618 100644
--- a/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
+++ b/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
@@ -10,8 +10,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.FetchMode;
 import org.hibernate.HibernateException;
@@ -191,7 +191,7 @@ public abstract class AbstractCollectionPersister
 	private Map collectionPropertyColumnAliases = new HashMap();
 	private Map collectionPropertyColumnNames = new HashMap();
 
-	private static final Log log = LogFactory.getLog( AbstractCollectionPersister.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractCollectionPersister.class );
 
 	public AbstractCollectionPersister(
 			final Collection collection,
diff --git a/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java b/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java
index 5d64193312..a319312152 100755
--- a/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java
+++ b/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java
@@ -3,8 +3,8 @@ package org.hibernate.persister.collection;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionImplementor;
@@ -19,7 +19,7 @@ public final class NamedQueryCollectionInitializer implements CollectionInitiali
 	private final String queryName;
 	private final CollectionPersister persister;
 	
-	private static final Log log = LogFactory.getLog(NamedQueryCollectionInitializer.class);
+	private static final Logger log = LoggerFactory.getLogger(NamedQueryCollectionInitializer.class);
 
 	public NamedQueryCollectionInitializer(String queryName, CollectionPersister persister) {
 		super();
diff --git a/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index ad7333d442..8a91da1228 100644
--- a/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -14,8 +14,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Comparator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.EntityMode;
 import org.hibernate.FetchMode;
@@ -100,7 +100,7 @@ public abstract class AbstractEntityPersister
 		implements OuterJoinLoadable, Queryable, ClassMetadata, UniqueKeyLoadable,
 		SQLLoadable, LazyPropertyInitializer, PostInsertIdentityPersister, Lockable {
 
-	private static final Log log = LogFactory.getLog( AbstractEntityPersister.class );
+	private static final Logger log = LoggerFactory.getLogger( AbstractEntityPersister.class );
 
 	public static final String ENTITY_CLASS = "class";
 
diff --git a/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java b/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
index a4d8aedd9f..8c49c52a29 100755
--- a/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
+++ b/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
@@ -3,8 +3,8 @@ package org.hibernate.persister.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.EntityKey;
@@ -21,7 +21,7 @@ public final class NamedQueryLoader implements UniqueEntityLoader {
 	private final String queryName;
 	private final EntityPersister persister;
 	
-	private static final Log log = LogFactory.getLog(NamedQueryLoader.class);
+	private static final Logger log = LoggerFactory.getLogger(NamedQueryLoader.class);
 
 	public NamedQueryLoader(String queryName, EntityPersister persister) {
 		super();
diff --git a/core/src/main/java/org/hibernate/pretty/Printer.java b/core/src/main/java/org/hibernate/pretty/Printer.java
index a8a7d52981..d6d5c2c37f 100644
--- a/core/src/main/java/org/hibernate/pretty/Printer.java
+++ b/core/src/main/java/org/hibernate/pretty/Printer.java
@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.EntityMode;
 import org.hibernate.engine.SessionFactoryImplementor;
@@ -24,7 +24,7 @@ import org.hibernate.type.Type;
 public final class Printer {
 
 	private SessionFactoryImplementor factory;
-	private static final Log log = LogFactory.getLog(Printer.class);
+	private static final Logger log = LoggerFactory.getLogger(Printer.class);
 
 	/**
 	 * @param entity an actual entity object, not a proxy!
diff --git a/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java b/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java
index b04521041d..b12959a7c0 100644
--- a/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java
+++ b/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java
@@ -6,8 +6,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.PropertyAccessException;
@@ -23,7 +23,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class BasicPropertyAccessor implements PropertyAccessor {
 
-	private static final Log log = LogFactory.getLog(BasicPropertyAccessor.class);
+	private static final Logger log = LoggerFactory.getLogger(BasicPropertyAccessor.class);
 
 	public static final class BasicSetter implements Setter {
 		private Class clazz;
diff --git a/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java b/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java
index e3ae292f5c..eac9b0944a 100644
--- a/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java
+++ b/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java
@@ -19,7 +19,7 @@ import org.hibernate.engine.SessionImplementor;
 import org.hibernate.type.AbstractComponentType;
 import org.hibernate.util.ReflectHelper;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 /**
  * A <tt>LazyInitializer</tt> implemented using the CGLIB bytecode generation library
@@ -65,7 +65,7 @@ public final class CGLIBLazyInitializer extends BasicLazyInitializer implements
 			return proxy;
 		}
 		catch (Throwable t) {
-			LogFactory.getLog( BasicLazyInitializer.class )
+			LoggerFactory.getLogger( BasicLazyInitializer.class )
 				.error( "CGLIB Enhancement failed: " + entityName, t );
 			throw new HibernateException( "CGLIB Enhancement failed: " + entityName, t );
 		}
diff --git a/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java b/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
index 9c82159bfd..86e1d279c7 100644
--- a/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
+++ b/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
@@ -9,7 +9,7 @@ import javassist.util.proxy.MethodHandler;
 import javassist.util.proxy.ProxyFactory;
 import javassist.util.proxy.ProxyObject;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.proxy.pojo.BasicLazyInitializer;
@@ -79,7 +79,7 @@ public class JavassistLazyInitializer extends BasicLazyInitializer implements Me
 			return proxy;
 		}
 		catch ( Throwable t ) {
-			LogFactory.getLog( BasicLazyInitializer.class ).error(
+			LoggerFactory.getLogger( BasicLazyInitializer.class ).error(
 					"Javassist Enhancement failed: " + entityName, t
 			);
 			throw new HibernateException(
@@ -138,7 +138,7 @@ public class JavassistLazyInitializer extends BasicLazyInitializer implements Me
 			return factory.createClass();
 		}
 		catch ( Throwable t ) {
-			LogFactory.getLog( BasicLazyInitializer.class ).error(
+			LoggerFactory.getLogger( BasicLazyInitializer.class ).error(
 					"Javassist Enhancement failed: "
 					+ persistentClass.getName(), t
 			);
diff --git a/core/src/main/java/org/hibernate/secure/JACCConfiguration.java b/core/src/main/java/org/hibernate/secure/JACCConfiguration.java
index c8d238ae0e..ca5850f6c4 100755
--- a/core/src/main/java/org/hibernate/secure/JACCConfiguration.java
+++ b/core/src/main/java/org/hibernate/secure/JACCConfiguration.java
@@ -8,8 +8,8 @@ import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyConfigurationFactory;
 import javax.security.jacc.PolicyContextException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 
 /**
@@ -19,7 +19,7 @@ import org.hibernate.HibernateException;
  */
 public class JACCConfiguration {
 
-	private static final Log log = LogFactory.getLog( JACCConfiguration.class );
+	private static final Logger log = LoggerFactory.getLogger( JACCConfiguration.class );
 
 	private final PolicyConfiguration policyConfiguration;
 
diff --git a/core/src/main/java/org/hibernate/stat/StatisticsImpl.java b/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
index 9f53ed732b..cf95e9ea64 100644
--- a/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
+++ b/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
@@ -3,8 +3,8 @@ package org.hibernate.stat;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.Region;
 import org.hibernate.engine.SessionFactoryImplementor;
@@ -19,7 +19,7 @@ public class StatisticsImpl implements Statistics, StatisticsImplementor {
 	
 	//TODO: we should provide some way to get keys of collection of statistics to make it easier to retrieve from a GUI perspective
 	
-	private static final Log log = LogFactory.getLog(StatisticsImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(StatisticsImpl.class);
 
 	private SessionFactoryImplementor sessionFactory;
 
diff --git a/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java b/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
index a108dc4645..1c880bd214 100644
--- a/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
+++ b/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
@@ -11,8 +11,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.exception.JDBCExceptionHelper;
 import org.hibernate.exception.SQLExceptionConverter;
@@ -26,7 +26,7 @@ import org.hibernate.util.StringHelper;
  */
 public class DatabaseMetadata {
 	
-	private static final Log log = LogFactory.getLog(DatabaseMetadata.class);
+	private static final Logger log = LoggerFactory.getLogger(DatabaseMetadata.class);
 	
 	private final Map tables = new HashMap();
 	private final Set sequences = new HashSet();
diff --git a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
index 81b02d9599..3b87fa2c52 100644
--- a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
+++ b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
@@ -18,8 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.cfg.Configuration;
@@ -41,7 +41,7 @@ import org.hibernate.util.JDBCExceptionReporter;
  */
 public class SchemaExport {
 
-	private static final Log log = LogFactory.getLog( SchemaExport.class );
+	private static final Logger log = LoggerFactory.getLogger( SchemaExport.class );
 
 	private ConnectionHelper connectionHelper;
 	private String[] dropSQL;
diff --git a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
index 303e67c34d..d8df3efa4d 100644
--- a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
+++ b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
@@ -9,8 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.NamingStrategy;
@@ -26,7 +26,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class SchemaUpdate {
 
-	private static final Log log = LogFactory.getLog( SchemaUpdate.class );
+	private static final Logger log = LoggerFactory.getLogger( SchemaUpdate.class );
 	private ConnectionHelper connectionHelper;
 	private Configuration configuration;
 	private Dialect dialect;
diff --git a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
index 68f49d78da..709e97156c 100755
--- a/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
+++ b/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
@@ -6,8 +6,8 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.NamingStrategy;
@@ -23,7 +23,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class SchemaValidator {
 
-	private static final Log log = LogFactory.getLog( SchemaValidator.class );
+	private static final Logger log = LoggerFactory.getLogger( SchemaValidator.class );
 	private ConnectionHelper connectionHelper;
 	private Configuration configuration;
 	private Dialect dialect;
diff --git a/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java b/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
index da020ee49c..a02efb32c0 100644
--- a/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
+++ b/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java
@@ -7,8 +7,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JDBC table metadata
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class TableMetadata {
 	
-	private static final Log log = LogFactory.getLog(TableMetadata.class);
+	private static final Logger log = LoggerFactory.getLogger(TableMetadata.class);
 	
 	private final String catalog;
 	private final String schema;
diff --git a/core/src/main/java/org/hibernate/transaction/CMTTransaction.java b/core/src/main/java/org/hibernate/transaction/CMTTransaction.java
index 5b184819ee..a7b566cb77 100755
--- a/core/src/main/java/org/hibernate/transaction/CMTTransaction.java
+++ b/core/src/main/java/org/hibernate/transaction/CMTTransaction.java
@@ -5,8 +5,8 @@ import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
 import org.hibernate.TransactionException;
@@ -20,7 +20,7 @@ import org.hibernate.util.JTAHelper;
  */
 public class CMTTransaction implements Transaction {
 
-	private static final Log log = LogFactory.getLog(CMTTransaction.class);
+	private static final Logger log = LoggerFactory.getLogger(CMTTransaction.class);
 
 	protected final JDBCContext jdbcContext;
 	protected final TransactionFactory.Context transactionContext;
diff --git a/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java b/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java
index 16a279029c..b9038f26c7 100644
--- a/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java
+++ b/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java
@@ -6,8 +6,8 @@ import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.TransactionException;
 import org.hibernate.jdbc.JDBCContext;
 import org.hibernate.util.JTAHelper;
@@ -17,7 +17,7 @@ import org.hibernate.util.JTAHelper;
  */
 public final class CacheSynchronization implements Synchronization {
 
-	private static final Log log = LogFactory.getLog(CacheSynchronization.class);
+	private static final Logger log = LoggerFactory.getLogger(CacheSynchronization.class);
 
 	private final TransactionFactory.Context ctx;
 	private JDBCContext jdbcContext;
diff --git a/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java b/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java
index fb9ea9d825..877bb9349a 100644
--- a/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java
+++ b/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java
@@ -8,8 +8,8 @@ import java.util.List;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
@@ -24,7 +24,7 @@ import org.hibernate.jdbc.JDBCContext;
  */
 public class JDBCTransaction implements Transaction {
 
-	private static final Log log = LogFactory.getLog(JDBCTransaction.class);
+	private static final Logger log = LoggerFactory.getLogger(JDBCTransaction.class);
 
 	private final JDBCContext jdbcContext;
 	private final TransactionFactory.Context transactionContext;
diff --git a/core/src/main/java/org/hibernate/transaction/JTATransaction.java b/core/src/main/java/org/hibernate/transaction/JTATransaction.java
index 5d2fe8ba3c..7936897dbb 100644
--- a/core/src/main/java/org/hibernate/transaction/JTATransaction.java
+++ b/core/src/main/java/org/hibernate/transaction/JTATransaction.java
@@ -9,8 +9,8 @@ import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
@@ -33,7 +33,7 @@ import org.hibernate.util.JTAHelper;
  */
 public class JTATransaction implements Transaction {
 
-	private static final Log log = LogFactory.getLog(JTATransaction.class);
+	private static final Logger log = LoggerFactory.getLogger(JTATransaction.class);
 
 	private final JDBCContext jdbcContext;
 	private final TransactionFactory.Context transactionContext;
diff --git a/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java b/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java
index ba31d53f05..15797acb4c 100644
--- a/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java
+++ b/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java
@@ -8,8 +8,8 @@ import javax.naming.NamingException;
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
@@ -27,7 +27,7 @@ import org.hibernate.util.JTAHelper;
  */
 public class JTATransactionFactory implements TransactionFactory {
 
-	private static final Log log = LogFactory.getLog(JTATransactionFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(JTATransactionFactory.class);
 	private static final String DEFAULT_USER_TRANSACTION_NAME = "java:comp/UserTransaction";
 
 	protected InitialContext context;
diff --git a/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java b/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java
index 2d9e015b48..0dbfa6913f 100644
--- a/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java
+++ b/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java
@@ -2,8 +2,8 @@ package org.hibernate.transaction;
 
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
@@ -14,7 +14,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public final class TransactionFactoryFactory {
 
-	private static final Log log = LogFactory.getLog(TransactionFactoryFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(TransactionFactoryFactory.class);
 
 	/**
 	 * Obtain a TransactionFactory with the transaction handling strategy
diff --git a/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java b/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java
index 96f39ec0b0..bd4084a41c 100644
--- a/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java
+++ b/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java
@@ -5,8 +5,8 @@ import java.util.Properties;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
@@ -17,7 +17,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public final class TransactionManagerLookupFactory {
 
-	private static final Log log = LogFactory.getLog(TransactionManagerLookupFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(TransactionManagerLookupFactory.class);
 
 	private TransactionManagerLookupFactory() {}
 
diff --git a/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java b/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java
index 018c848021..4b90d35311 100644
--- a/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java
+++ b/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java
@@ -5,8 +5,8 @@ import java.util.Properties;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 
@@ -16,7 +16,7 @@ import org.hibernate.HibernateException;
  */
 public class WebSphereTransactionManagerLookup implements TransactionManagerLookup {
 
-	private static final Log log = LogFactory.getLog(WebSphereTransactionManagerLookup.class);
+	private static final Logger log = LoggerFactory.getLogger(WebSphereTransactionManagerLookup.class);
 	private final int wsVersion;
 	private final Class tmfClass;
 	
diff --git a/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java b/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java
index bfedab6c0c..899dffae27 100644
--- a/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java
+++ b/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java
@@ -6,15 +6,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Gavin King
  */
 public class DistinctRootEntityResultTransformer implements ResultTransformer {
 
-	private static final Log log = LogFactory.getLog(DistinctRootEntityResultTransformer.class);
+	private static final Logger log = LoggerFactory.getLogger(DistinctRootEntityResultTransformer.class);
 
 	static final class Identity {
 		final Object entity;
diff --git a/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java b/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java
index fd64781a0f..eb2071052c 100755
--- a/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java
+++ b/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java
@@ -5,8 +5,8 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.InstantiationException;
 import org.hibernate.PropertyNotFoundException;
 import org.hibernate.bytecode.ReflectionOptimizer;
@@ -19,7 +19,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class PojoInstantiator implements Instantiator, Serializable {
 
-	private static final Log log = LogFactory.getLog(PojoInstantiator.class);
+	private static final Logger log = LoggerFactory.getLogger(PojoInstantiator.class);
 
 	private transient Constructor constructor;
 
diff --git a/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java b/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java
index 91b90d0649..d9ce07f155 100644
--- a/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java
+++ b/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java
@@ -16,8 +16,8 @@ import org.hibernate.tuple.Instantiator;
 import org.hibernate.tuple.Dom4jInstantiator;
 import org.hibernate.type.AbstractComponentType;
 import org.dom4j.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -32,7 +32,7 @@ import java.util.Iterator;
  */
 public class Dom4jEntityTuplizer extends AbstractEntityTuplizer {
 
-	static final Log log = LogFactory.getLog( Dom4jEntityTuplizer.class );
+	static final Logger log = LoggerFactory.getLogger( Dom4jEntityTuplizer.class );
 
 	private Set subclassNodeNames = new HashSet();
 
diff --git a/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java b/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java
index c904e97d4b..1a6ee5b358 100644
--- a/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java
+++ b/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java
@@ -16,8 +16,8 @@ import org.hibernate.property.PropertyAccessorFactory;
 import org.hibernate.property.Setter;
 import org.hibernate.proxy.map.MapProxyFactory;
 import org.hibernate.proxy.ProxyFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An {@link EntityTuplizer} specific to the dynamic-map entity mode.
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DynamicMapEntityTuplizer extends AbstractEntityTuplizer {
 
-	static final Log log = LogFactory.getLog( DynamicMapEntityTuplizer.class );
+	static final Logger log = LoggerFactory.getLogger( DynamicMapEntityTuplizer.class );
 
 	DynamicMapEntityTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappedEntity) {
 		super(entityMetamodel, mappedEntity);
diff --git a/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
index 9992084e0c..65923ce0ca 100644
--- a/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
+++ b/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
@@ -43,7 +43,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class EntityMetamodel implements Serializable {
 
-	private static final Log log = LogFactory.getLog(EntityMetamodel.class);
+	private static final Logger log = LoggerFactory.getLogger(EntityMetamodel.class);
 
 	private static final int NO_VERSION_INDX = -66;
 
diff --git a/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java b/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java
index 5014c8ebf4..67495335da 100644
--- a/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java
+++ b/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java
@@ -8,8 +8,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
@@ -42,7 +42,7 @@ import org.hibernate.util.ReflectHelper;
  */
 public class PojoEntityTuplizer extends AbstractEntityTuplizer {
 
-	static final Log log = LogFactory.getLog( PojoEntityTuplizer.class );
+	static final Logger log = LoggerFactory.getLogger( PojoEntityTuplizer.class );
 
 	private final Class mappedClass;
 	private final Class proxyInterface;
diff --git a/core/src/main/java/org/hibernate/type/DbTimestampType.java b/core/src/main/java/org/hibernate/type/DbTimestampType.java
index 840daee836..bd4d9a1f9b 100644
--- a/core/src/main/java/org/hibernate/type/DbTimestampType.java
+++ b/core/src/main/java/org/hibernate/type/DbTimestampType.java
@@ -11,8 +11,8 @@ import org.hibernate.engine.SessionImplementor;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.exception.JDBCExceptionHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <tt>dbtimestamp</tt>: An extension of {@link TimestampType} which
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DbTimestampType extends TimestampType implements VersionType {
 
-	private static final Log log = LogFactory.getLog( DbTimestampType.class );
+	private static final Logger log = LoggerFactory.getLogger( DbTimestampType.class );
 	
 	public String getName() { return "dbtimestamp"; }
 
diff --git a/core/src/main/java/org/hibernate/type/NullableType.java b/core/src/main/java/org/hibernate/type/NullableType.java
index c6bba05c05..67933c5679 100644
--- a/core/src/main/java/org/hibernate/type/NullableType.java
+++ b/core/src/main/java/org/hibernate/type/NullableType.java
@@ -5,8 +5,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 import org.dom4j.Node;
 
 import org.hibernate.EntityMode;
@@ -33,12 +33,12 @@ public abstract class NullableType extends AbstractType {
 	 * in order to check the trace-enablement.  Driving this via a central Log-specific class
 	 * would alleviate that performance hit, and yet still allow more "normal" logging usage/config.
 	 */
-	private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog( StringHelper.qualifier( Type.class.getName() ) ).isTraceEnabled();
-	private transient Log log;
+	private static final boolean IS_VALUE_TRACING_ENABLED = LoggerFactory.getLogger( StringHelper.qualifier( Type.class.getName() ) ).isTraceEnabled();
+	private transient Logger log;
 
-	private Log log() {
+	private Logger log() {
 		if ( log == null ) {
-			log = LogFactory.getLog( getClass() );
+			log = LoggerFactory.getLogger( getClass() );
 		}
 		return log;
 	}
diff --git a/core/src/main/java/org/hibernate/util/ConfigHelper.java b/core/src/main/java/org/hibernate/util/ConfigHelper.java
index fb512995ae..07a3dd5892 100644
--- a/core/src/main/java/org/hibernate/util/ConfigHelper.java
+++ b/core/src/main/java/org/hibernate/util/ConfigHelper.java
@@ -9,8 +9,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
 
@@ -20,7 +20,7 @@ import org.hibernate.cfg.Environment;
  * @author Steve
  */
 public final class ConfigHelper {
-	private static final Log log = LogFactory.getLog(ConfigHelper.class);
+	private static final Logger log = LoggerFactory.getLogger(ConfigHelper.class);
 
 	/** Try to locate a local URL representing the incoming path.  The first attempt
 	 * assumes that the incoming path is an actual URL string (file://, etc).  If this
@@ -84,7 +84,7 @@ public final class ConfigHelper {
 
 		if (url == null) {
 			String msg = "Unable to locate config file: " + path;
-			log.fatal(msg);
+			log.error( msg );
 			throw new HibernateException(msg);
 		}
 
diff --git a/core/src/main/java/org/hibernate/util/DTDEntityResolver.java b/core/src/main/java/org/hibernate/util/DTDEntityResolver.java
index d59fea6bef..8a0ce5192d 100644
--- a/core/src/main/java/org/hibernate/util/DTDEntityResolver.java
+++ b/core/src/main/java/org/hibernate/util/DTDEntityResolver.java
@@ -5,8 +5,8 @@ package org.hibernate.util;
 import java.io.InputStream;
 import java.io.Serializable;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 
@@ -28,7 +28,7 @@ import org.xml.sax.InputSource;
  */
 public class DTDEntityResolver implements EntityResolver, Serializable {
 
-	private static final Log log = LogFactory.getLog( DTDEntityResolver.class );
+	private static final Logger log = LoggerFactory.getLogger( DTDEntityResolver.class );
 
 	private static final String HIBERNATE_NAMESPACE = "http://hibernate.sourceforge.net/";
 	private static final String USER_NAMESPACE = "classpath://";
diff --git a/core/src/main/java/org/hibernate/util/JDBCExceptionReporter.java b/core/src/main/java/org/hibernate/util/JDBCExceptionReporter.java
index c71c0b7894..e262b0608a 100644
--- a/core/src/main/java/org/hibernate/util/JDBCExceptionReporter.java
+++ b/core/src/main/java/org/hibernate/util/JDBCExceptionReporter.java
@@ -5,12 +5,12 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class JDBCExceptionReporter {
 
-	public static final Log log = LogFactory.getLog(JDBCExceptionReporter.class);
+	public static final Logger log = LoggerFactory.getLogger(JDBCExceptionReporter.class);
 	public static final String DEFAULT_EXCEPTION_MSG = "SQL Exception";
 	public static final String DEFAULT_WARNING_MSG = "SQL Warning";
 
diff --git a/core/src/main/java/org/hibernate/util/NamingHelper.java b/core/src/main/java/org/hibernate/util/NamingHelper.java
index 9d0050cd0d..565a404ac5 100644
--- a/core/src/main/java/org/hibernate/util/NamingHelper.java
+++ b/core/src/main/java/org/hibernate/util/NamingHelper.java
@@ -11,14 +11,14 @@ import javax.naming.InitialContext;
 import javax.naming.Name;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cfg.Environment;
 
 public final class NamingHelper {
 
-	private static final Log log = LogFactory.getLog(NamingHelper.class);
+	private static final Logger log = LoggerFactory.getLogger(NamingHelper.class);
 
 	public static InitialContext getInitialContext(Properties props) throws NamingException {
 
diff --git a/core/src/main/java/org/hibernate/util/SerializationHelper.java b/core/src/main/java/org/hibernate/util/SerializationHelper.java
index fa47150937..263b0bc862 100644
--- a/core/src/main/java/org/hibernate/util/SerializationHelper.java
+++ b/core/src/main/java/org/hibernate/util/SerializationHelper.java
@@ -65,8 +65,8 @@ import java.io.ObjectInputStream;
 
 import org.hibernate.type.SerializationException;
 import org.hibernate.Hibernate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>Assists with the serialization process and performs additional functionality based
@@ -92,7 +92,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public final class SerializationHelper {
 
-	private static final Log log = LogFactory.getLog(SerializationHelper.class);
+	private static final Logger log = LoggerFactory.getLogger(SerializationHelper.class);
 
     private SerializationHelper() {}
 
diff --git a/core/src/main/java/org/hibernate/util/XMLHelper.java b/core/src/main/java/org/hibernate/util/XMLHelper.java
index ef89a63cac..fb4f5c786c 100644
--- a/core/src/main/java/org/hibernate/util/XMLHelper.java
+++ b/core/src/main/java/org/hibernate/util/XMLHelper.java
@@ -3,8 +3,8 @@ package org.hibernate.util;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.dom4j.io.DOMReader;
 import org.dom4j.io.SAXReader;
 import org.dom4j.io.OutputFormat;
@@ -23,7 +23,7 @@ import org.xml.sax.SAXParseException;
  */
 public final class XMLHelper {
 
-	private static final Log log = LogFactory.getLog(XMLHelper.class);
+	private static final Logger log = LoggerFactory.getLogger(XMLHelper.class);
 	public static final EntityResolver DEFAULT_DTD_RESOLVER = new DTDEntityResolver();
 
 	private DOMReader domReader;
diff --git a/documentation/manual/es-ES/src/main/docbook/modules/quickstart.xml b/documentation/manual/es-ES/src/main/docbook/modules/quickstart.xml
index 695097df9a..a526c45b17 100644
--- a/documentation/manual/es-ES/src/main/docbook/modules/quickstart.xml
+++ b/documentation/manual/es-ES/src/main/docbook/modules/quickstart.xml
@@ -515,7 +515,7 @@ import org.hibernate.cfg.*;
 
 public class HibernateUtil {
 
-    private static Log log = LogFactory.getLog(HibernateUtil.class);
+    private static Logger log = LoggerFactory.getLogger(HibernateUtil.class);
 
     private static final SessionFactory sessionFactory;
 
diff --git a/documentation/manual/ko-KR/src/main/docbook/modules/quickstart.xml b/documentation/manual/ko-KR/src/main/docbook/modules/quickstart.xml
index c58d42a0cd..b69cb93c4d 100644
--- a/documentation/manual/ko-KR/src/main/docbook/modules/quickstart.xml
+++ b/documentation/manual/ko-KR/src/main/docbook/modules/quickstart.xml
@@ -444,7 +444,7 @@ import org.hibernate.cfg.*;
 
 public class HibernateUtil {
 
-    private static Log log = LogFactory.getLog(HibernateUtil.class);
+    private static Logger log = LoggerFactory.getLogger(HibernateUtil.class);
 
     private static final SessionFactory sessionFactory;
 
diff --git a/documentation/manual/zh-CN/src/main/docbook/modules/quickstart.xml b/documentation/manual/zh-CN/src/main/docbook/modules/quickstart.xml
index 60a9bdd46b..4da2c1e349 100644
--- a/documentation/manual/zh-CN/src/main/docbook/modules/quickstart.xml
+++ b/documentation/manual/zh-CN/src/main/docbook/modules/quickstart.xml
@@ -353,7 +353,7 @@ import org.hibernate.cfg.*;
 
 public class HibernateUtil {
 
-    private static Log log = LogFactory.getLog(HibernateUtil.class);
+    private static Logger log = LoggerFactory.getLogger(HibernateUtil.class);
 
     private static final SessionFactory sessionFactory;
 
diff --git a/documentation/tutorial/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java b/documentation/tutorial/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java
index b1f03577c0..514abc92b9 100644
--- a/documentation/tutorial/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java
+++ b/documentation/tutorial/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java
@@ -8,8 +8,8 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.classic.Session;
 import org.hibernate.context.ManagedSessionContext;
@@ -23,7 +23,7 @@ import org.hibernate.tutorial.util.HibernateUtil;
  */
 public class SessionInterceptor implements Filter {
 
-	private static final Log log = LogFactory.getLog( SessionInterceptor.class );
+	private static final Logger log = LoggerFactory.getLogger( SessionInterceptor.class );
 
 	public void doFilter(
 			ServletRequest request,
diff --git a/jmx/pom.xml b/jmx/pom.xml
index 53252071c6..0acf03bc7d 100644
--- a/jmx/pom.xml
+++ b/jmx/pom.xml
@@ -3,13 +3,13 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core-parent</artifactId>
         <version>1</version>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jmx</artifactId>
     <version>3.3.0-SNAPSHOT</version>
@@ -24,9 +24,16 @@
             <artifactId>hibernate-core</artifactId>
             <version>${version}</version>
         </dependency>
+        <!-- logging setup for the test suite -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
         </dependency>
     </dependencies>
 
diff --git a/jmx/src/main/java/org/hibernate/jmx/HibernateService.java b/jmx/src/main/java/org/hibernate/jmx/HibernateService.java
index 38041c8849..000be9ea53 100644
--- a/jmx/src/main/java/org/hibernate/jmx/HibernateService.java
+++ b/jmx/src/main/java/org/hibernate/jmx/HibernateService.java
@@ -6,8 +6,8 @@ import java.util.Map;
 
 import javax.naming.InitialContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.HibernateException;
 import org.hibernate.SessionFactory;
@@ -28,7 +28,7 @@ import org.hibernate.util.ExternalSessionFactoryConfig;
  */
 public class HibernateService extends ExternalSessionFactoryConfig implements HibernateServiceMBean {
 
-	private static final Log log = LogFactory.getLog(HibernateServiceMBean.class);
+	private static final Logger log = LoggerFactory.getLogger(HibernateServiceMBean.class);
 
 	private String boundName;
 	private Properties properties = new Properties();
diff --git a/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java b/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
index d0a54e6db8..36e5ac633f 100644
--- a/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
+++ b/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
@@ -12,8 +12,8 @@ import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -36,7 +36,7 @@ import org.hibernate.stat.Statistics;
  */
 public class SessionFactoryStub implements SessionFactory {
 
-	private static final Log log = LogFactory.getLog(SessionFactoryStub.class);
+	private static final Logger log = LoggerFactory.getLogger(SessionFactoryStub.class);
 
 	private static final IdentifierGenerator UUID_GENERATOR = new UUIDHexGenerator();
 
diff --git a/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java b/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java
index 0d3cb8ea88..e262c6208f 100644
--- a/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java
+++ b/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java
@@ -6,8 +6,8 @@ import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.SessionFactory;
 import org.hibernate.impl.SessionFactoryObjectFactory;
 import org.hibernate.stat.CollectionStatistics;
@@ -55,7 +55,7 @@ public class StatisticsService implements StatisticsServiceMBean {
 	
 	SessionFactory sf;
 	String sfJNDIName;
-	Log log = LogFactory.getLog(StatisticsService.class);
+	Logger log = LoggerFactory.getLogger(StatisticsService.class);
 	Statistics stats = new StatisticsImpl();
 
 	/**
diff --git a/pom.xml b/pom.xml
index f2d98b3302..1de787545f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
@@ -17,6 +17,7 @@
 
     <name>Hibernate Core Aggregator</name>
     <description>Aggregator of the Hibernate Core modules.</description>
+    <url>http://hibernate.org</url>
 
     <scm>
         <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
diff --git a/testing/pom.xml b/testing/pom.xml
index 2cd2702546..1c1649668d 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -28,6 +28,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <!-- here we need to pull JUnit deps into compile scope... -->
+            <version>3.8.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/testing/src/main/java/org/hibernate/junit/SkipLog.java b/testing/src/main/java/org/hibernate/junit/SkipLog.java
index 381a06c499..445e9fa012 100644
--- a/testing/src/main/java/org/hibernate/junit/SkipLog.java
+++ b/testing/src/main/java/org/hibernate/junit/SkipLog.java
@@ -1,7 +1,7 @@
 package org.hibernate.junit;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Well-known-location lookup for the test-skip log...
@@ -9,5 +9,5 @@ import org.apache.commons.logging.LogFactory;
  * @author Steve Ebersole
  */
 public class SkipLog {
-	public static final Log LOG = LogFactory.getLog( "org.hibernate.test.SKIPPED" );
+	public static final Logger LOG = LoggerFactory.getLogger( "org.hibernate.test.SKIPPED" );
 }
diff --git a/testing/src/main/java/org/hibernate/junit/UnitTestCase.java b/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
index 4eb22b6bf7..862ea5dfca 100644
--- a/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
+++ b/testing/src/main/java/org/hibernate/junit/UnitTestCase.java
@@ -2,8 +2,8 @@ package org.hibernate.junit;
 
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import junit.framework.AssertionFailedError;
 
 
@@ -15,7 +15,7 @@ import junit.framework.AssertionFailedError;
  */
 public abstract class UnitTestCase extends junit.framework.TestCase {
 
-	private static final Log log = LogFactory.getLog( UnitTestCase.class );
+	private static final Logger log = LoggerFactory.getLogger( UnitTestCase.class );
 
 	public UnitTestCase(String string) {
 		super( string );
diff --git a/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java b/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java
index e1fe9043cf..868206ceef 100644
--- a/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java
+++ b/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java
@@ -17,8 +17,8 @@ import org.hibernate.Session;
 import org.hibernate.junit.UnitTestCase;
 import org.hibernate.engine.SessionFactoryImplementor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Most of the Hibernate test suite in fact is a series of functional tests, not
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class FunctionalTestCase extends UnitTestCase implements ExecutionEnvironment.Settings {
 
-	private static final Log log = LogFactory.getLog( FunctionalTestCase.class );
+	private static final Logger log = LoggerFactory.getLogger( FunctionalTestCase.class );
 
 	private ExecutionEnvironment environment;
 	private boolean isEnvironmentLocallyManaged;
diff --git a/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java b/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java
index c9de8d55c9..3da5d2b901 100644
--- a/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java
+++ b/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java
@@ -4,8 +4,8 @@ import junit.framework.TestSuite;
 import junit.framework.Test;
 import junit.framework.TestResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A specialized {@link junit.framework.TestSuite} implementation intended
@@ -17,7 +17,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class FunctionalTestClassTestSuite extends TestSuite {
 
-	private static final Log log = LogFactory.getLog( FunctionalTestClassTestSuite.class );
+	private static final Logger log = LoggerFactory.getLogger( FunctionalTestClassTestSuite.class );
 
 	private ExecutionEnvironment.Settings settings;
 	private ExecutionEnvironment environment;
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 46872eb91c..1b68a2434a 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -19,18 +19,6 @@
     <description>The testsuite of Hibernate functionality</description>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>hibernate-core</artifactId>
@@ -83,6 +71,17 @@
             <artifactId>jaxen</artifactId>
             <version>1.1</version>
         </dependency>
+        <!-- logging setup for the test suite -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -95,7 +94,7 @@
                 </includes>
             </testResource>
             <testResource>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
                 <directory>src/test/resources</directory>
             </testResource>
         </testResources>
@@ -128,7 +127,6 @@
         </plugins>
     </build>
 
-    <!-- Set up profiles defining test environments -->
     <profiles>
         <!-- HSQLDB is the default (eventually move to H2) -->
         <profile>
@@ -143,17 +141,14 @@
                     <version>1.8.0.2</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/hsqldb</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect>
+                <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
+                <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
+                <jdbc.user>sa</jdbc.user>
+                <jdbc.pass/>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The H2 test envionment -->
@@ -166,21 +161,22 @@
                     <version>1.0.20061217</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/h2</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect>
+                <jdbc.driver>org.h2.Driver</jdbc.driver>
+                <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
+                <jdbc.user>sa</jdbc.user>
+                <jdbc.pass/>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!--
+            ###################################################################
             Profiles naming db instances in the Red Hat QA/QE lab
+
+            First, those with OSS drivers
+            ###################################################################
         -->
 
         <!-- The MySQL5 test envionment -->
@@ -193,17 +189,14 @@
                     <version>5.0.5</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/mysql5</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
+                <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
+                <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The PostgreSQL test envionment -->
@@ -217,19 +210,22 @@
                     <classifier>jdbc3</classifier>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/pgsql8</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
+                <jdbc.driver>org.postgresql.Driver</jdbc.driver>
+                <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
+        <!--
+            ###################################################################
+            Then, those with commercial drivers
+            ###################################################################
+        -->
+
         <!-- The Oracle9i test envionment -->
         <profile>
             <id>oracle9i</id>
@@ -241,17 +237,14 @@
                     <version>10.0.2.0</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/oracle9i</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
+                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The Oracle10g test envionment -->
@@ -265,40 +258,39 @@
                     <version>10.0.2.0</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/oracle10g</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
+                <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
+                <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
-        <!-- The DB2 8.x test envionment -->
+        <!-- The DB2 8.x test envionment (using 9x drivers)-->
         <profile>
             <id>db2-8</id>
             <dependencies>
                 <dependency>
                     <groupId>com.ibm</groupId>
-                    <artifactId>ojdbc14</artifactId>
-                    <version>10.0.2.0</version>
+                    <artifactId>db2jcc</artifactId>
+                    <version>3.1.57</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.ibm</groupId>
+                    <artifactId>db2jcc_license_cu</artifactId>
+                    <version>3.1.57</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/db2-8</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
+                <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
+                <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
+                <jdbc.user>hiber</jdbc.user>
+                <jdbc.pass>hiber</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The Sybase 12 test envionment -->
@@ -311,17 +303,14 @@
                     <version>6.0.5</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/sybase12</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect>
+                <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
+                <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The SQLServer2005 (jTDS) test envionment -->
@@ -334,17 +323,14 @@
                     <version>1.2</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/sqlserver2005/jtds</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+                <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver>
+                <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation/>
+            </properties>
         </profile>
 
         <!-- The SQLServer2005 (MS JDBC) test envionment -->
@@ -357,17 +343,14 @@
                     <version>1.1</version>
                 </dependency>
             </dependencies>
-            <build>
-                <testResources>
-                    <testResource>
-                        <directory>${basedir}/src/test/profile/rh-qa/sqlserver2005/msjdbc</directory>
-                        <filtering>false</filtering>
-                        <includes>
-                            <include>hibernate.properties</include>
-                        </includes>
-                    </testResource>
-                </testResources>
-            </build>
+            <properties>
+                <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
+                <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
+                <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
+                <jdbc.user>cruisecontrol</jdbc.user>
+                <jdbc.pass>cruisecontrol</jdbc.pass>
+                <jdbc.isolation>4096</jdbc.isolation>
+            </properties>
         </profile>
 
     </profiles>
diff --git a/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
index cbfc2ee73a..ac414e1a16 100644
--- a/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
@@ -11,8 +11,8 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.Hibernate;
 import org.hibernate.LockMode;
@@ -45,7 +45,7 @@ import org.hibernate.test.legacy.Single;
  */
 public class SQLFunctionsInterSystemsTest extends DatabaseSpecificFunctionalTestCase {
 
-	private static final Log log = LogFactory.getLog(SQLFunctionsInterSystemsTest.class);
+	private static final Logger log = LoggerFactory.getLogger(SQLFunctionsInterSystemsTest.class);
 
 	public SQLFunctionsInterSystemsTest(String name) {
 		super(name);
diff --git a/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java b/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
index f4a1a1c326..0d7082118a 100644
--- a/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
@@ -11,8 +11,8 @@ import java.util.Set;
 
 import junit.framework.Test;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.hibernate.EntityMode;
 import org.hibernate.FetchMode;
 import org.hibernate.Hibernate;
@@ -37,7 +37,7 @@ import org.hibernate.transform.DistinctRootEntityResultTransformer;
  */
 public class DynamicFilterTest extends FunctionalTestCase {
 
-	private Log log = LogFactory.getLog( DynamicFilterTest.class );
+	private Logger log = LoggerFactory.getLogger( DynamicFilterTest.class );
 
 	public DynamicFilterTest(String testName) {
 		super( testName );
diff --git a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
index cfca06e4bf..d20a94a5de 100644
--- a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
@@ -51,8 +51,8 @@ import org.hibernate.type.ManyToOneType;
 import org.hibernate.type.Type;
 import org.hibernate.util.StringHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Tests the integration of the new AST parser into the loading of query results using
@@ -66,7 +66,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class ASTParserLoadingTest extends FunctionalTestCase {
 
-	private static final Log log = LogFactory.getLog( ASTParserLoadingTest.class );
+	private static final Logger log = LoggerFactory.getLogger( ASTParserLoadingTest.class );
 
 	private List createdAnimalIds = new ArrayList();
 
diff --git a/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java b/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
index 9c7edd5138..acc5dbf6a2 100644
--- a/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
@@ -17,8 +17,8 @@ import org.hibernate.junit.functional.FunctionalTestCase;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 import org.hibernate.persister.entity.EntityPersister;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class BulkManipulationTest extends FunctionalTestCase {
 
-	private static final Log log = LogFactory.getLog( BulkManipulationTest.class );
+	private static final Logger log = LoggerFactory.getLogger( BulkManipulationTest.class );
 
 	public BulkManipulationTest(String name) {
 		super( name );
diff --git a/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java b/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java
index c742f2cd90..03adb1082a 100644
--- a/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java
@@ -11,8 +11,8 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.event.FlushEntityEventListener;
 import org.hibernate.event.FlushEntityEvent;
 import org.hibernate.cfg.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import junit.framework.Test;
 
 /**
@@ -30,7 +30,7 @@ import junit.framework.Test;
  */
 public class CascadeTest extends AbstractJPATest {
 
-	public static final Log log = LogFactory.getLog( CascadeTest.class );
+	public static final Logger log = LoggerFactory.getLogger( CascadeTest.class );
 
 	public CascadeTest(String name) {
 		super( name );
diff --git a/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java b/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
index 3a667bd895..eae877d44c 100644
--- a/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
@@ -33,7 +33,7 @@ import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
 public class SQLFunctionsTest extends LegacyTestCase {
 
-	private static final Log log = LogFactory.getLog(SQLFunctionsTest.class);
+	private static final Logger log = LoggerFactory.getLogger(SQLFunctionsTest.class);
 
 	public SQLFunctionsTest(String name) {
 		super(name);
diff --git a/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java b/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java
index 69616ce65f..33eae97252 100644
--- a/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java
+++ b/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Properties;
 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.usertype.UserType;
@@ -41,10 +41,10 @@ public class DefaultValueIntegerType implements UserType, ParameterizedType, Ser
 
 	public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException {
 		if (value == null || defaultValue.equals(value) ) {
-			LogFactory.getLog( getClass() ).trace("binding null to parameter: " + index);
+			LoggerFactory.getLogger( getClass() ).trace("binding null to parameter: " + index);
 			st.setNull(index, Types.INTEGER);
 		} else {
-			LogFactory.getLog( getClass() ).trace("binding " + value + " to parameter: " + index);
+			LoggerFactory.getLogger( getClass() ).trace("binding " + value + " to parameter: " + index);
 			st.setInt(index, ((Integer)value).intValue());
 		}
 	}
diff --git a/testsuite/src/test/profile/hsqldb/hsqldb-env.xml b/testsuite/src/test/profile/hsqldb/hsqldb-env.xml
deleted file mode 100644
index 2d153f9b92..0000000000
--- a/testsuite/src/test/profile/hsqldb/hsqldb-env.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<environments>
-    <environment name="hsqldb">
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/profile/hsqldb</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>hibernate.properties</include>
-                </includes>
-            </testResource>
-        </testResources>
-        <dependencies>
-            <dependency>
-                <groupId>hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>1.8.0.2</version>
-            </dependency>
-        </dependencies>
-    </environment>
-</environments>
\ No newline at end of file
diff --git a/testsuite/src/test/resources/hibernate.properties b/testsuite/src/test/resources/hibernate.properties
new file mode 100644
index 0000000000..be95e86067
--- /dev/null
+++ b/testsuite/src/test/resources/hibernate.properties
@@ -0,0 +1,30 @@
+################################################################################
+# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
+#                                                                              #
+# This copyrighted material is made available to anyone wishing to use, modify,#
+# copy, or redistribute it subject to the terms and conditions of the GNU      #
+# Lesser General Public License, v. 2.1. This program is distributed in the    #
+# hope that it will be useful, but WITHOUT A WARRANTY; without even the implied#
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. You should have received a   #
+# copy of the GNU Lesser General Public License, v.2.1 along with this         #
+# distribution; if not, write to the Free Software Foundation, Inc.,           #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
+#                                                                              #
+# Red Hat Author(s): Steve Ebersole                                            #
+################################################################################
+hibernate.dialect ${db.dialect}
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
+
+hibernate.connection.pool_size 5
+
+hibernate.format_sql true
+
+hibernate.max_fetch_depth 5
+
+hibernate.cache.region_prefix hibernate.test
+hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
diff --git a/testsuite/src/test/resources/log4j.properties b/testsuite/src/test/resources/log4j.properties
index 9df5f264b1..dee74ac910 100644
--- a/testsuite/src/test/resources/log4j.properties
+++ b/testsuite/src/test/resources/log4j.properties
@@ -4,6 +4,6 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
 
-log4j.rootLogger=warn, stdout
+log4j.rootLogger=info, stdout
 
 log4j.logger.org.hibernate.test=info
\ No newline at end of file