Hibernate SVN: r14673 - in validator/trunk: &n...

Author Login • Post Reply

Author: epbernard
Date: 2008-05-17 08:52:14 -0400 (Sat, 17 May 2008)
New Revision: 14673

Modified:
validator/trunk/ivy.xml
validator/trunk/pom.xml
validator/trunk/src/java/org/hibernate/validator/ClassValidator.java
validator/trunk/src/java/org/hibernate/validator/Version.java
validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java
Log:
HV-57 move to slf4j

Modified: validator/trunk/ivy.xml
===================================================================
--- validator/trunk/ivy.xml 2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/ivy.xml 2008-05-17 12:52:14 UTC (rev 14673)
@@(protected) @@
<conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
</configurations>
<publications>
- <artifact name="hibernate-validator" conf="core"/>
+ <artifact name="hibernate-validator" conf="default"/>
</publications>
<dependencies>

<dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/>
<dependency name="commons-annotations" rev="latest" conf="default->default"/>
<dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/>
- <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"/>


- <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="test->default"/>
<dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/>
<dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/>

Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/pom.xml 2008-05-17 12:52:14 UTC (rev 14673)
@@(protected) @@
<version>3.1.0.CR1</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.2</version>
</dependency>

<dependency>

Modified: validator/trunk/src/java/org/hibernate/validator/ClassValidator.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/ClassValidator.java 2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/ClassValidator.java 2008-05-17 12:52:14 UTC (rev 14673)
@@(protected) @@
import java.util.Set;
import java.util.StringTokenizer;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hibernate.AssertionFailure;
import org.hibernate.Hibernate;
import org.hibernate.MappingException;
@@(protected) @@
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
import org.hibernate.util.IdentitySet;
import org.hibernate.validator.interpolator.DefaultMessageInterpolatorAggregator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

/**
@@(protected) @@
*/
public class ClassValidator<T> implements Serializable {
//TODO Define magic number
- private static Log log = LogFactory.getLog( ClassValidator.class );
+ private static final Logger log = LoggerFactory.getLogger( ClassValidator.class );
private static final InvalidValue[] EMPTY_INVALID_VALUE_ARRAY = new InvalidValue[]{};
private static final String DEFAULT_VALIDATOR_MESSAGE = "org.hibernate.validator.resources.DefaultValidatorMessages";
private static final String VALIDATOR_MESSAGE = "ValidatorMessages";
@@(protected) @@
);
}
catch (MissingResourceException e) {
- log.trace( "ResourceBundle " + VALIDATOR_MESSAGE + " not found in thread context classloader" );
+ log.trace( "ResourceBundle {} not found in thread context classloader", VALIDATOR_MESSAGE );
//then use the Validator Framework classloader
try {
rb = ResourceBundle.getBundle(
@@(protected) @@
}
catch (MissingResourceException ee) {
log.debug(
- "ResourceBundle ValidatorMessages not found in Validator classloader. Delegate to " + DEFAULT_VALIDATOR_MESSAGE
+ "ResourceBundle ValidatorMessages not found in Validator classloader. Delegate to {}",
+ DEFAULT_VALIDATOR_MESSAGE
);
//the user did not override the default ValidatorMessages
rb = null;
@@(protected) @@
validatorPresent = validatorPresent || agrValidPresent;
}
if ( validatorPresent && !member.isTypeResolved() ) {
- log.warn( "Original type of property " + member + " is unbound and has been approximated." );
+ log.warn( "Original type of property {} is unbound and has been approximated.", member );
}
}

Modified: validator/trunk/src/java/org/hibernate/validator/Version.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/Version.java 2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/Version.java 2008-05-17 12:52:14 UTC (rev 14673)
@@(protected) @@
//$Id: $
package org.hibernate.validator;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

/**
* Hibernate Vaildator version
@@(protected) @@
*/
public class Version {
public static final String VERSION = "3.0.0.GA";
- private static Log log = LogFactory.getLog( Version.class );
+ private static Logger log = LoggerFactory.getLogger( Version.class );

static {
- log.info( "Hibernate Validator " + VERSION );
+ log.info( "Hibernate Validator {}", VERSION );
}

public static void touch() {

Modified: validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java
===================================================================
--- validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java 2008-05-17 12:50:57 UTC (rev 14672)
+++ validator/trunk/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java 2008-05-17 12:52:14 UTC (rev 14673)
@@(protected) @@
import java.util.ResourceBundle;
import java.util.StringTokenizer;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hibernate.util.StringHelper;
import org.hibernate.validator.MessageInterpolator;
import org.hibernate.validator.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

/**
* Resource bundle based interpolator
@@(protected) @@
* @author Emmanuel Bernard
*/
public class DefaultMessageInterpolator implements MessageInterpolator, Serializable {
- private static Log log = LogFactory.getLog( DefaultMessageInterpolator.class );
+ private static final Logger log = LoggerFactory.getLogger( DefaultMessageInterpolator.class );
private Map<String, Object> annotationParameters = new HashMap<String, Object>();
private transient ResourceBundle messageBundle;
private transient ResourceBundle defaultMessageBundle;
@@(protected) @@
}
catch (IllegalAccessException e) {
//really should not happen, but we degrade nicely
- log.warn( "Unable to access " + StringHelper.qualify( clazz.toString(), method.getName() ) );
+ log.warn( "Unable to access {}", StringHelper.qualify( clazz.toString(), method.getName() ) );
}
catch (InvocationTargetException e) {
//really should not happen, but we degrade nicely
- log.warn( "Unable to access " + StringHelper.qualify( clazz.toString(), method.getName() ) );
+ log.warn( "Unable to access {}", StringHelper.qualify( clazz.toString(), method.getName() ) );
}
}
annotationMessage = (String) annotationParameters.get( "message" );

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits

[hibernate-commits] Hibernate SVN: r14673 - in validator/trunk: src/java/org/hibernate/validator and 1 other directories.

hibernate-commits

2008-05-17

[hibernate-commits] Hibernate SVN: r14673 - in validator/trunk:
src/java/org/hibernate/validator and 1 other directories.