[hibernate-commits] Hibernate SVN: r14670 - in commons-annotations/trunk: src/java/org/hibernate/annotations/common and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2008-05-17 08:47:32 -0400 (Sat, 17 May 2008)
New Revision: 14670

Modified:
   commons-annotations/trunk/ivy.xml
   commons-annotations/trunk/pom.xml
   commons-annotations/trunk/src/java/org/hibernate/annotations/common/AssertionFailure.java
Log:
HCANN-1 move to slf4j

Modified: commons-annotations/trunk/ivy.xml
===================================================================
--- commons-annotations/trunk/ivy.xml	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/ivy.xml	2008-05-17 12:47:32 UTC (rev 14670)
@@ -13,11 +13,8 @@
     </publications>
     <dependencies>
 		<!-- compile time dependencies -->
-        <dependency org="commons-logging" name="commons-logging" rev="1.0.4" conf="default->default"/>
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>
 
-        <!-- transitive dependencies -->
-        <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="test->default"/> <!-- soon to be a dep -->
-
         <!-- test deps -->
         <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="test->default"/>
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/>

Modified: commons-annotations/trunk/pom.xml
===================================================================
--- commons-annotations/trunk/pom.xml	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/pom.xml	2008-05-17 12:47:32 UTC (rev 14670)
@@ -20,9 +20,9 @@
 	</scm>
 	<dependencies>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.2</version>
+        </dependency>
 	</dependencies>
 </project>
\ No newline at end of file

Modified: commons-annotations/trunk/src/java/org/hibernate/annotations/common/AssertionFailure.java
===================================================================
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/AssertionFailure.java	2008-05-16 16:27:59 UTC (rev 14669)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/AssertionFailure.java	2008-05-17 12:47:32 UTC (rev 14670)
@@ -1,9 +1,10 @@
 //$Id: $
 package org.hibernate.annotations.common;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
+
 /**
  * Indicates failure of an assertion: a possible bug in Hibernate.
  *
@@ -13,7 +14,7 @@
 //TODO Copy from Hibernate Core, do some mutualization here?
 public class AssertionFailure extends RuntimeException {
 
-	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)";