You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/04/03 02:28:28 UTC
svn commit: r930445 [3/3] - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1:
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/
component-support/trinidad-support/src/main/java/org/ap...
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java Sat Apr 3 00:28:26 2010
@@ -43,7 +43,7 @@ public class ReflectionUtils
{
return getMethod(targetClass, targetMethodName, parameterTypes);
}
- catch (Throwable t)
+ catch (Exception e)
{
//do nothing - it's just a try
return null;
@@ -121,7 +121,7 @@ public class ReflectionUtils
{
return invokeMethodOfClass(target, method, args);
}
- catch (Throwable e)
+ catch (Exception e)
{
//do nothing - it's just a try
return null;
@@ -146,7 +146,7 @@ public class ReflectionUtils
{
return invokeMethod(target, method, args);
}
- catch (Throwable t)
+ catch (Exception e)
{
//do nothing - it's just a try
return null;
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/util/TestUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/util/TestUtils.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/util/TestUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/base-test-infrastructure/src/test/java/org/apache/myfaces/extensions/validator/test/base/util/TestUtils.java Sat Apr 3 00:28:26 2010
@@ -19,6 +19,8 @@
package org.apache.myfaces.extensions.validator.test.base.util;
import java.io.IOException;
+import java.util.logging.Logger;
+import java.util.logging.Level;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
@@ -26,13 +28,10 @@ import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.Renderer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public final class TestUtils
{
/** Default Logger */
- private static final Log log = LogFactory.getLog(TestUtils.class);
+ private static final Logger log = Logger.getLogger(TestUtils.class.getName());
/** utility class, do not instantiate */
private TestUtils()
@@ -206,7 +205,7 @@ public final class TestUtils
}
catch (ClassNotFoundException e)
{
- log.error("Class " + type + " not found", e);
+ log.log(Level.SEVERE, "Class " + type + " not found", e);
throw new FacesException(e);
}
}
@@ -244,17 +243,17 @@ public final class TestUtils
}
catch (NoClassDefFoundError e)
{
- log.error("Class : " + clazz.getName() + " not found.", e);
+ log.log(Level.SEVERE, "Class : " + clazz.getName() + " not found.", e);
throw new FacesException(e);
}
catch (InstantiationException e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw new FacesException(e);
}
catch (IllegalAccessException e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw new FacesException(e);
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptor.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptor.java Sat Apr 3 00:28:26 2010
@@ -50,10 +50,7 @@ public class BeanValidationModuleValidat
protected void initComponent(FacesContext facesContext, UIComponent uiComponent)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("start to init component " + uiComponent.getClass().getName());
- }
+ logger.finest("start to init component " + uiComponent.getClass().getName());
PropertyDetails propertyDetails = bviUtils.extractPropertyDetails(
facesContext, uiComponent, getPropertiesForComponentMetaDataExtractor(uiComponent));
@@ -63,10 +60,7 @@ public class BeanValidationModuleValidat
initComponentWithPropertyDetails(facesContext, uiComponent, propertyDetails);
}
- if (logger.isTraceEnabled())
- {
- logger.trace("init component of " + uiComponent.getClass().getName() + " finished");
- }
+ logger.finest("init component of " + uiComponent.getClass().getName() + " finished");
}
protected void initComponentWithPropertyDetails(FacesContext facesContext,
@@ -85,10 +79,7 @@ public class BeanValidationModuleValidat
{
if (validateProperty)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("jsr303 start validation");
- }
+ logger.finest("jsr303 start validation");
processFieldValidation(facesContext, uiComponent, convertedObject, propertyInformation);
}
@@ -97,10 +88,7 @@ public class BeanValidationModuleValidat
{
if (validateProperty)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("jsr303 validation finished");
- }
+ logger.finest("jsr303 validation finished");
}
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptorInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptorInternals.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptorInternals.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptorInternals.java Sat Apr 3 00:28:26 2010
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval;
-import org.apache.commons.logging.Log;
import org.apache.myfaces.extensions.validator.beanval.validation.strategy.BeanValidationVirtualValidationStrategy;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
@@ -44,6 +43,7 @@ import javax.validation.metadata.Element
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -52,9 +52,9 @@ import java.util.Set;
@UsageInformation(UsageCategory.INTERNAL)
class BeanValidationModuleValidationInterceptorInternals
{
- private Log logger;
+ private Logger logger;
- BeanValidationModuleValidationInterceptorInternals(Log logger)
+ BeanValidationModuleValidationInterceptorInternals(Logger logger)
{
this.logger = logger;
}
@@ -66,9 +66,9 @@ class BeanValidationModuleValidationInte
.extract(facesContext, uiComponent)
.getInformation(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class);
- if (result.getBaseObject() == null && this.logger.isWarnEnabled())
+ if (result.getBaseObject() == null)
{
- this.logger.warn("no base object at " + result.getKey() +
+ this.logger.warning("no base object at " + result.getKey() +
" component-id: " + uiComponent.getClientId(facesContext));
}
@@ -176,10 +176,8 @@ class BeanValidationModuleValidationInte
{
MetaDataEntry entry;
Map<String, Object> result;
- if (this.logger.isDebugEnabled())
- {
- this.logger.debug(metaDataTransformer.getClass().getName() + " instantiated");
- }
+
+ this.logger.fine(metaDataTransformer.getClass().getName() + " instantiated");
entry = new MetaDataEntry();
entry.setKey(constraintDescriptor.getAnnotation().annotationType().getName());
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java Sat Apr 3 00:28:26 2010
@@ -33,14 +33,13 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
import javax.validation.MessageInterpolator;
import javax.validation.ValidatorFactory;
import java.util.Map;
import java.util.List;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -49,7 +48,7 @@ import java.util.List;
@UsageInformation(UsageCategory.API)
public class ExtValBeanValidationContext implements GroupStorage, ModelValidationStorage
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private static final String KEY = ExtValBeanValidationContext.class.getName() + ":KEY";
@@ -97,10 +96,7 @@ public class ExtValBeanValidationContext
return (ValidatorFactory)validatorFactory;
}
- if(this.logger.isWarnEnabled())
- {
- this.logger.warn("fallback to the default bv validator factory");
- }
+ this.logger.warning("fallback to the default bv validator factory");
return BeanValidationUtils.getDefaultValidatorFactory();
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java Sat Apr 3 00:28:26 2010
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval;
-import org.apache.commons.logging.Log;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.storage.MappedConstraintSourceStorage;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
@@ -49,6 +48,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Set;
import java.util.Collections;
+import java.util.logging.Logger;
+import java.util.logging.Level;
/**
* @author Gerhard Petracek
@@ -57,11 +58,11 @@ import java.util.Collections;
@UsageInformation(UsageCategory.INTERNAL)
class MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals
{
- private Log logger;
+ private Logger logger;
private BeanValidationModuleValidationInterceptorInternals bviUtils;
MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals(
- Log logger, BeanValidationModuleValidationInterceptorInternals bviUtils)
+ Logger logger, BeanValidationModuleValidationInterceptorInternals bviUtils)
{
this.logger = logger;
this.bviUtils = bviUtils;
@@ -281,11 +282,8 @@ class MappedConstraintSourceBeanValidati
}
catch (NoSuchMethodException e1)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("method not found - class: " + entity.getName()
- + " - methods: " + "get" + property + " " + "is" + property);
- }
+ logger.finest("method not found - class: " + entity.getName()
+ + " - methods: " + "get" + property + " " + "is" + property);
return null;
}
@@ -327,10 +325,7 @@ class MappedConstraintSourceBeanValidati
}
catch (NoSuchFieldException e1)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("field " + property + " or _" + property + " not found", e1);
- }
+ logger.log(Level.FINEST, "field " + property + " or _" + property + " not found", e1);
return null;
}
@@ -545,7 +540,7 @@ class MappedConstraintSourceBeanValidati
{
return (T) annotationMethod.invoke(annotation);
}
- catch (Throwable t)
+ catch (Exception e)
{
//do nothing
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/startup/BeanValidationStartupListener.java Sat Apr 3 00:28:26 2010
@@ -104,12 +104,9 @@ public class BeanValidationStartupListen
}
else
{
- if (this.logger.isWarnEnabled())
- {
- this.logger.warn(storageManager.getClass().getName() +
- " has to implement AbstractNameMapperAwareFactory " + getClass().getName() +
- " couldn't register " + BeanValidationGroupStorageNameMapper.class.getName());
- }
+ this.logger.warning(storageManager.getClass().getName() +
+ " has to implement AbstractNameMapperAwareFactory " + getClass().getName() +
+ " couldn't register " + BeanValidationGroupStorageNameMapper.class.getName());
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java Sat Apr 3 00:28:26 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.beanval.storage.ModelValidationEntry;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
import org.apache.myfaces.extensions.validator.core.validation.message.FacesMessageHolder;
@@ -38,6 +36,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.Map;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -46,7 +45,7 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class BeanValidationUtils
{
- private static final Log LOGGER = LogFactory.getLog(BeanValidationUtils.class);
+ private static final Logger LOGGER = Logger.getLogger(BeanValidationUtils.class.getName());
private static ExtValBeanValidationMetaDataInternals bvmi = new ExtValBeanValidationMetaDataInternals(LOGGER);
private static final String VALIDATOR_FACTORY_KEY = "javax.faces.validator.beanValidator.ValidatorFactory";
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java Sat Apr 3 00:28:26 2010
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval.util;
-import org.apache.commons.logging.Log;
import org.apache.myfaces.extensions.validator.beanval.ExtValBeanValidationContext;
import org.apache.myfaces.extensions.validator.beanval.payload.ViolationSeverity;
import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
@@ -49,6 +48,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -57,10 +57,10 @@ import java.util.List;
@UsageInformation(UsageCategory.INTERNAL)
class ExtValBeanValidationMetaDataInternals
{
- private Log logger;
+ private Logger logger;
private LabeledMessageInternals labeledMessageInternals = new LabeledMessageInternals();
- ExtValBeanValidationMetaDataInternals(Log logger)
+ ExtValBeanValidationMetaDataInternals(Logger logger)
{
this.logger = logger;
}
@@ -489,10 +489,7 @@ class ExtValBeanValidationMetaDataIntern
}
else
{
- if (this.logger.isErrorEnabled())
- {
- this.logger.error("an invalid condition is used: " + condition);
- }
+ this.logger.severe("an invalid condition is used: " + condition);
}
}
return false;
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/ModelValidationPhaseListener.java Sat Apr 3 00:28:26 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.beanval.validation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.beanval.BeanValidationModuleKey;
import org.apache.myfaces.extensions.validator.beanval.ExtValBeanValidationContext;
import org.apache.myfaces.extensions.validator.beanval.annotation.ModelValidation;
@@ -52,6 +50,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -63,14 +62,11 @@ public class ModelValidationPhaseListene
{
private static final long serialVersionUID = -3482233893186708878L;
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public void afterPhase(PhaseEvent phaseEvent)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("jsr303 start model validation");
- }
+ logger.finest("jsr303 start model validation");
Map<Object, List<Class>> processedValidationTargets = new HashMap<Object, List<Class>>();
@@ -85,10 +81,7 @@ public class ModelValidationPhaseListene
executeGlobalAfterValidationInterceptorsFor(results);
- if (logger.isTraceEnabled())
- {
- logger.trace("jsr303 validation finished");
- }
+ logger.finest("jsr303 validation finished");
}
private List<ModelValidationEntry> getModelValidationEntriesToValidate()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/DefaultMessageInterpolator.java Sat Apr 3 00:28:26 2010
@@ -18,14 +18,13 @@
*/
package org.apache.myfaces.extensions.validator.beanval.validation.message.interpolator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import javax.validation.MessageInterpolator;
import javax.faces.context.FacesContext;
import java.util.Locale;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -34,8 +33,8 @@ import java.util.Locale;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultMessageInterpolator implements MessageInterpolator
{
- protected final Log logger = LogFactory.getLog(getClass());
-
+ protected final Logger logger = Logger.getLogger(getClass().getName());
+
private MessageInterpolator wrapped;
public DefaultMessageInterpolator(MessageInterpolator wrapped)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/validation/message/interpolator/ExtValMessageInterpolatorAdapter.java Sat Apr 3 00:28:26 2010
@@ -63,11 +63,8 @@ public class ExtValMessageInterpolatorAd
}
else
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("you tried to use an extval message-resolver for" +
- "jsr303 validation with an invalid key -> using a default interpolator");
- }
+ this.logger.finest("you tried to use an extval message-resolver for" +
+ "jsr303 validation with an invalid key -> using a default interpolator");
}
}
return super.interpolate(messageOrKey, context, getCurrentLocale());
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/JoinValidationMetaDataStorageFilter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/JoinValidationMetaDataStorageFilter.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/JoinValidationMetaDataStorageFilter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/JoinValidationMetaDataStorageFilter.java Sat Apr 3 00:28:26 2010
@@ -136,7 +136,7 @@ public class JoinValidationMetaDataStora
addMetaData(result, extractDynamicMetaData(metaDataEntry, target));
}
}
- catch (Throwable t)
+ catch (Exception e)
{
//do nothing a different filter might introduce a new syntax which causes the exception
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Sat Apr 3 00:28:26 2010
@@ -95,10 +95,7 @@ public class PropertyValidationModuleSta
private void addSkipValidationSupport()
{
- if(logger.isInfoEnabled())
- {
- logger.info("adding support for @SkipValidation");
- }
+ logger.info("adding support for @SkipValidation");
ExtValContext.getContext().denyRendererInterceptor(ValidationInterceptor.class);
ExtValContext.getContext().registerRendererInterceptor(new PropertyValidationModuleValidationInterceptor());
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JoinMetaDataTransformer.java Sat Apr 3 00:28:26 2010
@@ -30,13 +30,12 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.PropertyValidationUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
import java.util.HashMap;
import java.util.Map;
import java.util.Collections;
+import java.util.logging.Logger;
import java.lang.annotation.Annotation;
/**
@@ -47,7 +46,7 @@ import java.lang.annotation.Annotation;
@Deprecated
public class JoinMetaDataTransformer implements MetaDataTransformer
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public Map<String, Object> convertMetaData(MetaDataEntry metaDataEntry)
{
@@ -55,14 +54,11 @@ public class JoinMetaDataTransformer imp
{
return convert(metaDataEntry);
}
- catch (Throwable t)
+ catch (Exception e)
{
- if(this.logger.isWarnEnabled())
- {
- this.logger.warn("this class is replaced by a meta-data storage filter. " +
- "if it gets invoked and an exception occurs, a custom syntax is used." +
- "this class might be used by an old add-on. please check for a newer version.");
- }
+ this.logger.warning("this class is replaced by a meta-data storage filter. " +
+ "if it gets invoked and an exception occurs, a custom syntax is used." +
+ "this class might be used by an old add-on. please check for a newer version.");
return Collections.emptyMap();
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java Sat Apr 3 00:28:26 2010
@@ -34,6 +34,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
import javax.faces.FacesException;
+import java.util.logging.Level;
/**
* @author Gerhard Petracek
@@ -55,14 +56,11 @@ public class JoinValidationStrategy exte
{
throw t;
}
- catch (Throwable t)
+ catch (Exception e)
{
- if(this.logger.isWarnEnabled())
- {
- this.logger.warn("this class is replaced by a meta-data storage filter. " +
- "if it gets invoked and an exception occurs, a custom syntax is used." +
- "this class might be used by an old add-on. please check for a newer version.");
- }
+ this.logger.log(Level.WARNING, "this class is replaced by a meta-data storage filter. " +
+ "if it gets invoked and an exception occurs, a custom syntax is used." +
+ "this class might be used by an old add-on. please check for a newer version.", e);
}
}
@@ -99,10 +97,7 @@ public class JoinValidationStrategy exte
}
else
{
- if(logger.isTraceEnabled())
- {
- logger.trace("no validation strategy found for " + entry.getValue());
- }
+ logger.finest("no validation strategy found for " + entry.getValue());
}
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/ValidatorStrategy.java Sat Apr 3 00:28:26 2010
@@ -54,10 +54,7 @@ public class ValidatorStrategy extends A
if (validator == null)
{
- if(logger.isTraceEnabled())
- {
- logger.trace(validatorClassName.getName() + " not found");
- }
+ logger.finest(validatorClassName.getName() + " not found");
continue;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Sat Apr 3 00:28:26 2010
@@ -109,7 +109,7 @@ public class CrossValidationPhaseListene
entry,
validatorException);
}
- catch (Throwable e)
+ catch (Exception e)
{
throw new FacesException(e);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java Sat Apr 3 00:28:26 2010
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.MissingResourceException;
+import java.util.logging.Level;
import java.lang.annotation.Annotation;
import javax.faces.application.FacesMessage;
@@ -267,11 +268,8 @@ public abstract class AbstractCompareStr
}
catch (MissingResourceException e)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent)
- + DETAIL_MESSAGE_KEY_POSTFIX, e);
- }
+ logger.log(Level.WARNING, "couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent)
+ + DETAIL_MESSAGE_KEY_POSTFIX, e);
}
return null;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java Sat Apr 3 00:28:26 2010
@@ -29,6 +29,7 @@ import javax.faces.context.FacesContext;
import java.text.DateFormat;
import java.util.Date;
import java.util.MissingResourceException;
+import java.util.logging.Level;
/**
* @author Gerhard Petracek
@@ -171,11 +172,8 @@ public class DateIsStrategy extends Abst
}
catch (MissingResourceException e)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent)
- + DETAIL_MESSAGE_KEY_POSTFIX, e);
- }
+ logger.log(Level.WARNING, "couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent)
+ + DETAIL_MESSAGE_KEY_POSTFIX, e);
}
return null;
}
@@ -196,11 +194,8 @@ public class DateIsStrategy extends Abst
}
catch (MissingResourceException e)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation)
- + DETAIL_MESSAGE_KEY_POSTFIX, e);
- }
+ logger.log(Level.WARNING, "couldn't find key " + getValidationErrorMsgKey(annotation)
+ + DETAIL_MESSAGE_KEY_POSTFIX, e);
}
return null;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/ELCompareStrategy.java Sat Apr 3 00:28:26 2010
@@ -29,10 +29,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.core.el.ValueBindingExpression;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
+import java.util.logging.Logger;
/**
* referencing validation targets - possible formats:
@@ -44,7 +43,7 @@ import javax.faces.context.FacesContext;
@UsageInformation(UsageCategory.INTERNAL)
class ELCompareStrategy implements ReferencingStrategy
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public boolean evaluateReferenceAndValidate(
CrossValidationStorageEntry crossValidationStorageEntry,
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/LocalCompareStrategy.java Sat Apr 3 00:28:26 2010
@@ -30,10 +30,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.extensions.validator.util.ProxyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.lang.reflect.Method;
+import java.util.logging.Logger;
/**
* "[property_name]" ... local validation -> cross-component, but no cross-entity validation
@@ -44,7 +43,7 @@ import java.lang.reflect.Method;
@UsageInformation(UsageCategory.INTERNAL)
class LocalCompareStrategy implements ReferencingStrategy
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public boolean evaluateReferenceAndValidate(
CrossValidationStorageEntry crossValidationStorageEntry,
@@ -163,11 +162,8 @@ class LocalCompareStrategy implements Re
private void unsupportedCase(CrossValidationStorageEntry crossValidationStorageEntry)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't find converted object for " + crossValidationStorageEntry.getMetaDataEntry()
- .getProperty(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class).getKey());
- }
+ logger.warning("couldn't find converted object for " + crossValidationStorageEntry.getMetaDataEntry()
+ .getProperty(PropertyInformationKeys.PROPERTY_DETAILS, PropertyDetails.class).getKey());
}
private void processCrossComponentValidation(
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/PropertyValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/PropertyValidationUtils.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/PropertyValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/PropertyValidationUtils.java Sat Apr 3 00:28:26 2010
@@ -24,10 +24,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.baseval.strategy.SkipValidationStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -36,7 +35,7 @@ import javax.faces.context.FacesContext;
@UsageInformation(UsageCategory.INTERNAL)
public class PropertyValidationUtils
{
- private static final Log LOGGER = LogFactory.getLog(PropertyValidationUtils.class);
+ private static final Logger LOGGER = Logger.getLogger(PropertyValidationUtils.class.getName());
public static boolean isValidationSkipped(FacesContext facesContext,
ValidationStrategy validationStrategy,
@@ -50,10 +49,7 @@ public class PropertyValidationUtils
if(Boolean.TRUE.equals(skipValidation))
{
- if(LOGGER.isTraceEnabled())
- {
- LOGGER.trace("validation of " + validationStrategy.getClass().getName() + " canceled");
- }
+ LOGGER.finest("validation of " + validationStrategy.getClass().getName() + " canceled");
return true;
}