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 [1/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...
Author: gpetracek
Date: Sat Apr 3 00:28:26 2010
New Revision: 930445
URL: http://svn.apache.org/viewvc?rev=930445&view=rev
Log:
EXTVAL-84 and minor changes
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/util/TrinidadUtils.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultProjectStageResolver.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContextInvocationOrderAwareInternals.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/AbstractELHelperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractRendererInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/FacesMessagePropertyValidationInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationSeverityValidationExceptionInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/AbstractCustomNameMapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractorFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/AbstractValidationStrategyToMetaDataTransformerNameMapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/proxy/DefaultProxyHelper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererWrapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultGroupStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultPropertyStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultRendererInterceptorPropertyStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultStorageManagerFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultViolationSeverityInterpreterStorage.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/AbstractValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ReflectionUtils.java
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
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptor.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/BeanValidationModuleValidationInterceptorInternals.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/ExtValBeanValidationContext.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/MappedConstraintSourceBeanValidationModuleValidationInterceptorInternals.java
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
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
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
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
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
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
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/JoinValidationMetaDataStorageFilter.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
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
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
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
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
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
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
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
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
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/PropertyValidationUtils.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java Sat Apr 3 00:28:26 2010
@@ -89,10 +89,7 @@ public final class ExtValGenericRenderer
}
else
{
- if(logger.isTraceEnabled())
- {
- logger.trace("method " + method.getName() + " called without rendering-interceptors");
- }
+ logger.finest("method " + method.getName() + " called without rendering-interceptors");
return proxy.invokeSuper(obj, args);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java Sat Apr 3 00:28:26 2010
@@ -33,10 +33,7 @@ public class GenericRenderKitWrapperFact
{
protected RenderKit createWrapper(RenderKit renderKit)
{
- if(logger.isTraceEnabled())
- {
- logger.trace("extval renderkit wrapper created for " + renderKit.getClass().getName() + " via cglib");
- }
+ logger.finest("extval renderkit wrapper created for " + renderKit.getClass().getName() + " via cglib");
return ExtValGenericRenderKit.newInstance(renderKit);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/util/TrinidadUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/util/TrinidadUtils.java?rev=930445&r1=930444&r2=930445&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/util/TrinidadUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/util/TrinidadUtils.java Sat Apr 3 00:28:26 2010
@@ -23,12 +23,11 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.trinidad.component.core.output.CoreOutputLabel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.EditableValueHolder;
import javax.faces.context.FacesContext;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -38,7 +37,7 @@ import javax.faces.context.FacesContext;
@ToDo(value = Priority.MEDIUM, description = "check subform")
public class TrinidadUtils
{
- protected static final Log LOG = LogFactory.getLog(TrinidadUtils.class);
+ protected static final Logger LOG = Logger.getLogger(TrinidadUtils.class.getName());
public static UIComponent findLabeledEditableComponent(CoreOutputLabel coreOutputLabel)
{
@@ -56,10 +55,7 @@ public class TrinidadUtils
return result;
}
- if(LOG.isTraceEnabled())
- {
- LOG.trace(coreOutputLabel.getClientId(facesContext) + " doesn't reference an editable component");
- }
+ LOG.finest(coreOutputLabel.getClientId(facesContext) + " doesn't reference an editable component");
return null;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultProjectStageResolver.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/core/DefaultProjectStageResolver.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/core/DefaultProjectStageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/DefaultProjectStageResolver.java Sat Apr 3 00:28:26 2010
@@ -40,7 +40,7 @@ public class DefaultProjectStageResolver
result = FacesContext.getCurrentInstance()
.getExternalContext().getInitParameter("javax.faces.PROJECT_STAGE");
}
- catch (Throwable t)
+ catch (Exception e)
{
return createProjectStage(getDefaultProjectStage());
}
@@ -61,4 +61,4 @@ public class DefaultProjectStageResolver
{
return ExtValUtils.getDefaultStageName();
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.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/core/ExtValContext.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/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Sat Apr 3 00:28:26 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.core.factory.DefaultFactoryFinder;
import org.apache.myfaces.extensions.validator.core.factory.FactoryFinder;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
@@ -44,6 +42,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -52,7 +51,7 @@ import java.util.Map;
@UsageInformation(UsageCategory.API)
public class ExtValContext
{
- private final Log logger = LogFactory.getLog(getClass());
+ private final Logger logger = Logger.getLogger(getClass().getName());
private static ExtValContext extValContext;
@@ -114,7 +113,7 @@ public class ExtValContext
{
if (this.violationSeverityInterpreter == null || forceOverride)
{
- if (this.logger.isInfoEnabled() && violationSeverityInterpreter != null)
+ if (violationSeverityInterpreter != null)
{
this.logger.info(violationSeverityInterpreter.getClass() + " is used");
}
@@ -163,7 +162,7 @@ public class ExtValContext
{
if (this.skipValidationEvaluator == null || forceOverride)
{
- if (this.logger.isInfoEnabled() && skipValidationEvaluator != null)
+ if (skipValidationEvaluator != null)
{
this.logger.info(skipValidationEvaluator.getClass() + " is used");
}
@@ -390,13 +389,10 @@ public class ExtValContext
return false;
}
- if (this.logger.isInfoEnabled())
- {
- this.logger.info("override global property '" + name + "'");
- }
+ this.logger.info("override global property '" + name + "'");
}
- if(JsfProjectStage.is(JsfProjectStage.Development) && this.logger.isInfoEnabled())
+ if(JsfProjectStage.is(JsfProjectStage.Development))
{
this.logger.info("global property [" + name + "] added");
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContextInvocationOrderAwareInternals.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/core/ExtValContextInvocationOrderAwareInternals.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/core/ExtValContextInvocationOrderAwareInternals.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContextInvocationOrderAwareInternals.java Sat Apr 3 00:28:26 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
import org.apache.myfaces.extensions.validator.core.interceptor.MetaDataExtractionInterceptor;
import org.apache.myfaces.extensions.validator.core.interceptor.PropertyValidationInterceptor;
@@ -33,6 +31,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Collections;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -41,7 +40,7 @@ import java.util.Collections;
@UsageInformation(UsageCategory.INTERNAL)
class ExtValContextInvocationOrderAwareInternals
{
- private final Log logger = LogFactory.getLog(getClass());
+ private final Logger logger = Logger.getLogger(getClass().getName());
private List<MetaDataExtractionInterceptor> metaDataExtractionInterceptors = null;
private Map<Class, List<MetaDataExtractionInterceptor>> moduleSpecificMetaDataExtractionInterceptors = null;
@@ -144,10 +143,7 @@ class ExtValContextInvocationOrderAwareI
{
this.propertyValidationInterceptors.add(propertyValidationInterceptor);
- if (logger.isTraceEnabled())
- {
- logger.trace(propertyValidationInterceptor.getClass().getName() + " added as global interceptor");
- }
+ logger.finest(propertyValidationInterceptor.getClass().getName() + " added as global interceptor");
}
else
{
@@ -163,10 +159,7 @@ class ExtValContextInvocationOrderAwareI
}
propertyValidationInterceptorList.add(propertyValidationInterceptor);
- if (logger.isTraceEnabled())
- {
- logger.trace(propertyValidationInterceptor.getClass().getName() + " added for " + moduleKey.getName());
- }
+ logger.finest(propertyValidationInterceptor.getClass().getName() + " added for " + moduleKey.getName());
}
}
@@ -210,10 +203,7 @@ class ExtValContextInvocationOrderAwareI
{
this.metaDataExtractionInterceptors.add(metaDataExtractionInterceptor);
- if (logger.isTraceEnabled())
- {
- logger.trace(metaDataExtractionInterceptor.getClass().getName() + " added as global interceptor");
- }
+ logger.finest(metaDataExtractionInterceptor.getClass().getName() + " added as global interceptor");
}
else
{
@@ -229,10 +219,7 @@ class ExtValContextInvocationOrderAwareI
}
metaDataExtractionInterceptorList.add(metaDataExtractionInterceptor);
- if (logger.isTraceEnabled())
- {
- logger.trace(metaDataExtractionInterceptor.getClass().getName() + " added for " + moduleKey.getName());
- }
+ logger.finest(metaDataExtractionInterceptor.getClass().getName() + " added for " + moduleKey.getName());
}
}
@@ -301,10 +288,7 @@ class ExtValContextInvocationOrderAwareI
{
validationExceptionInterceptors.add(validationExceptionInterceptor);
- if (logger.isTraceEnabled())
- {
- logger.trace(validationExceptionInterceptor.getClass().getName() + " added");
- }
+ logger.finest(validationExceptionInterceptor.getClass().getName() + " added");
}
}
}
@@ -365,10 +349,7 @@ class ExtValContextInvocationOrderAwareI
{
componentInitializers.add(componentInitializer);
- if (logger.isTraceEnabled())
- {
- logger.trace(componentInitializer.getClass().getName() + " added");
- }
+ logger.finest(componentInitializer.getClass().getName() + " added");
}
}
}
@@ -475,4 +456,4 @@ class ExtValContextInvocationOrderAwareI
return metaDataExtractionInterceptorList;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.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/core/InformationProviderBean.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/core/InformationProviderBean.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java Sat Apr 3 00:28:26 2010
@@ -21,11 +21,10 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Map;
import java.util.HashMap;
+import java.util.logging.Logger;
/**
* centralized in order that these information aren't spread over the complete code base
@@ -40,7 +39,7 @@ import java.util.HashMap;
@UsageInformation({UsageCategory.API, UsageCategory.CUSTOMIZABLE})
public class InformationProviderBean
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public static final String BEAN_NAME = ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME
+ "." + InformationProviderBean.class.getSimpleName();
@@ -50,10 +49,7 @@ public class InformationProviderBean
public InformationProviderBean()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
setupCustomizableInformation();
applyCustomValues(this.customizableInfos);
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/AbstractELHelperFactory.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/core/el/AbstractELHelperFactory.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/core/el/AbstractELHelperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/AbstractELHelperFactory.java Sat Apr 3 00:28:26 2010
@@ -20,8 +20,8 @@ package org.apache.myfaces.extensions.va
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 java.util.logging.Logger;
/**
* details
@@ -33,15 +33,12 @@ import org.apache.commons.logging.LogFac
@UsageInformation({UsageCategory.INTERNAL, UsageCategory.CUSTOMIZABLE})
public abstract class AbstractELHelperFactory
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
protected AbstractELHelperFactory customELHelperFactory;
protected AbstractELHelperFactory()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public void setCustomELHelperFactory(AbstractELHelperFactory elHelperFactory)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.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/core/el/DefaultELHelper.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/core/el/DefaultELHelper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/DefaultELHelper.java Sat Apr 3 00:28:26 2010
@@ -26,8 +26,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.extensions.validator.util.ProxyUtils;
import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -35,6 +33,7 @@ import javax.faces.el.ValueBinding;
import java.io.Externalizable;
import java.lang.reflect.Method;
import java.util.Map;
+import java.util.logging.Logger;
/**
* in order to centralize the jsf version dependency within the core
@@ -52,14 +51,11 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultELHelper implements ELHelper
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public DefaultELHelper()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public Class getTypeOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression)
@@ -94,11 +90,8 @@ public class DefaultELHelper implements
//(e.g. for special component libs -> issue with ExtValRendererWrapper#encodeBegin)
if(valueBindingExpression == null)
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace(
- uiComponent.getClass() + " has no value binding - component id: " + uiComponent.getId());
- }
+ this.logger.finest(
+ uiComponent.getClass() + " has no value binding - component id: " + uiComponent.getId());
return null;
}
@@ -115,10 +108,7 @@ public class DefaultELHelper implements
if(result == null)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't resolve expression: " + valueBindingExpression);
- }
+ logger.warning("couldn't resolve expression: " + valueBindingExpression);
return null;
}
@@ -127,10 +117,7 @@ public class DefaultELHelper implements
if(entityClass == null)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't resolve expression: " + result.getExpressionString());
- }
+ logger.warning("couldn't resolve expression: " + result.getExpressionString());
return null;
}
@@ -227,11 +214,8 @@ public class DefaultELHelper implements
}
else
{
- if(this.logger.isErrorEnabled())
- {
- this.logger.error("unexpected value within map syntax: " + propertyChain +
- " last property name: " + currentPropertyValue);
- }
+ this.logger.severe("unexpected value within map syntax: " + propertyChain +
+ " last property name: " + currentPropertyValue);
return null;
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.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/core/factory/DefaultFactoryFinder.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/core/factory/DefaultFactoryFinder.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java Sat Apr 3 00:28:26 2010
@@ -36,13 +36,12 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.validation.parameter.DefaultValidationParameterExtractorFactory;
import org.apache.myfaces.extensions.validator.core.validation.parameter.DefaultValidationParameterFactory;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -52,17 +51,14 @@ import java.util.ArrayList;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultFactoryFinder implements FactoryFinder
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
protected Map<FactoryNames, Object> factoryMap = new HashMap<FactoryNames, Object>();
private static FactoryFinder factoryFinder = new DefaultFactoryFinder();
protected DefaultFactoryFinder()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public static FactoryFinder getInstance()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractRendererInterceptor.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/core/interceptor/AbstractRendererInterceptor.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/core/interceptor/AbstractRendererInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractRendererInterceptor.java Sat Apr 3 00:28:26 2010
@@ -23,14 +23,13 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipRendererDelegationException;
import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipBeforeInterceptorsException;
import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipAfterInterceptorsException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
import javax.faces.convert.ConverterException;
import javax.faces.render.Renderer;
import java.io.IOException;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -39,14 +38,11 @@ import java.io.IOException;
@UsageInformation(UsageCategory.INTERNAL)
public abstract class AbstractRendererInterceptor implements RendererInterceptor
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
protected AbstractRendererInterceptor()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public final String getInterceptorId()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.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/core/interceptor/AbstractValidationInterceptor.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/core/interceptor/AbstractValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/AbstractValidationInterceptor.java Sat Apr 3 00:28:26 2010
@@ -42,6 +42,7 @@ import javax.el.PropertyNotFoundExceptio
import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
+import java.util.logging.Level;
/**
* @author Gerhard Petracek
@@ -95,11 +96,8 @@ public abstract class AbstractValidation
}
catch (PropertyNotFoundException r)
{
- if(this.logger.isFatalEnabled())
- {
- this.logger.fatal("it seems you are using an invalid binding. " + wrapped.getClass().getName()
- + ": conversion failed. normally this is >not< a myfaces extval issue!", r);
- }
+ this.logger.log(Level.SEVERE, "it seems you are using an invalid binding. " + wrapped.getClass().getName()
+ + ": conversion failed. normally this is >not< a myfaces extval issue!", r);
throw r;
}
@@ -113,10 +111,7 @@ public abstract class AbstractValidation
{
recorder.recordUserInput(uiComponent, convertedObject);
- if(logger.isTraceEnabled())
- {
- logger.trace(recorder.getClass().getName() + " called");
- }
+ logger.finest(recorder.getClass().getName() + " called");
}
}
@@ -201,11 +196,8 @@ public abstract class AbstractValidation
{
if(isValueToValidateEmpty(convertedObject) && !validateEmptyFields())
{
- if(this.logger.isDebugEnabled())
- {
- this.logger.debug("empty field validation is deactivated in the web.xml - see: " +
- "javax.faces.VALIDATE_EMPTY_FIELDS");
- }
+ this.logger.fine("empty field validation is deactivated in the web.xml - see: " +
+ "javax.faces.VALIDATE_EMPTY_FIELDS");
return false;
}
@@ -242,7 +234,7 @@ public abstract class AbstractValidation
{
return ExtValUtils.getELHelper().getPropertyDetailsOfValueBinding(uiComponent) != null;
}
- catch (Throwable t)
+ catch (Exception e)
{
return false;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/FacesMessagePropertyValidationInterceptor.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/core/interceptor/FacesMessagePropertyValidationInterceptor.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/core/interceptor/FacesMessagePropertyValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/FacesMessagePropertyValidationInterceptor.java Sat Apr 3 00:28:26 2010
@@ -23,12 +23,11 @@ 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.util.ExtValUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.util.Map;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -38,7 +37,7 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class FacesMessagePropertyValidationInterceptor implements PropertyValidationInterceptor
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public boolean beforeValidation(
FacesContext facesContext, UIComponent uiComponent, Object convertedObject, Map<String, Object> properties)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.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/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.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/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/HtmlCoreComponentsValidationExceptionInterceptor.java Sat Apr 3 00:28:26 2010
@@ -30,8 +30,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlInputText;
@@ -48,6 +46,7 @@ import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
import javax.faces.application.FacesMessage;
import java.lang.annotation.Annotation;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -57,7 +56,7 @@ import java.lang.annotation.Annotation;
@UsageInformation(UsageCategory.INTERNAL)
public class HtmlCoreComponentsValidationExceptionInterceptor implements ValidationExceptionInterceptor
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public boolean afterThrowing(UIComponent uiComponent,
MetaDataEntry metaDataEntry,
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.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/core/interceptor/ValidationInterceptor.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/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Sat Apr 3 00:28:26 2010
@@ -51,10 +51,7 @@ public class ValidationInterceptor exten
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());
Map<String, Object> metaDataResult = ExtValUtils
.getTransformedMetaDataFor(facesContext, uiComponent, getModuleKey());
@@ -66,10 +63,7 @@ public class ValidationInterceptor exten
ExtValUtils.configureComponentWithMetaData(facesContext, uiComponent, metaDataResult);
}
- if(logger.isTraceEnabled())
- {
- logger.trace("init component of " + uiComponent.getClass().getName() + " finished");
- }
+ logger.finest("init component of " + uiComponent.getClass().getName() + " finished");
}
protected void processValidation(FacesContext facesContext, UIComponent uiComponent, Object convertedObject)
@@ -81,19 +75,13 @@ public class ValidationInterceptor exten
try
{
- if(logger.isTraceEnabled())
- {
- logger.trace("start validation");
- }
+ logger.finest("start validation");
processFieldValidation(facesContext, uiComponent, convertedObject, propertyInformation);
}
finally
{
- if(logger.isTraceEnabled())
- {
- logger.trace("validation finished");
- }
+ logger.finest("validation finished");
}
}
@@ -118,19 +106,13 @@ public class ValidationInterceptor exten
{
if(skipValidationEvaluator.skipValidation(facesContext, uiComponent, validationStrategy, entry))
{
- if(logger.isTraceEnabled())
- {
- logger.trace("skip validation of " + entry.getValue() +
- " with " + validationStrategy.getClass().getName());
- }
+ logger.finest("skip validation of " + entry.getValue() +
+ " with " + validationStrategy.getClass().getName());
//don't break maybe there are constraints which don't support the skip-mechanism
continue;
}
- if(logger.isTraceEnabled())
- {
- logger.trace("validate " + entry.getValue() + " with " + validationStrategy.getClass().getName());
- }
+ logger.finest("validate " + entry.getValue() + " with " + validationStrategy.getClass().getName());
try
{
@@ -161,9 +143,9 @@ public class ValidationInterceptor exten
}
}
}
- else if(validationStrategy == null && logger.isTraceEnabled())
+ else if(validationStrategy == null)
{
- 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/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationSeverityValidationExceptionInterceptor.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/core/interceptor/ViolationSeverityValidationExceptionInterceptor.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/core/interceptor/ViolationSeverityValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ViolationSeverityValidationExceptionInterceptor.java Sat Apr 3 00:28:26 2010
@@ -25,13 +25,12 @@ 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.util.ExtValUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
import javax.faces.validator.ValidatorException;
import javax.faces.application.FacesMessage;
import java.lang.annotation.Annotation;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -41,7 +40,7 @@ import java.lang.annotation.Annotation;
@UsageInformation(UsageCategory.INTERNAL)
public class ViolationSeverityValidationExceptionInterceptor implements ValidationExceptionInterceptor
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public boolean afterThrowing(UIComponent uiComponent,
MetaDataEntry metaDataEntry,
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/AbstractCustomNameMapper.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/core/mapper/AbstractCustomNameMapper.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/core/mapper/AbstractCustomNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/AbstractCustomNameMapper.java Sat Apr 3 00:28:26 2010
@@ -21,9 +21,8 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.util.ClassUtils;
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 java.util.logging.Logger;
/**
* A generic implementation. Subclasses just have to now the fully qualified name of the name mapper.
*
@@ -35,15 +34,12 @@ import org.apache.commons.logging.LogFac
@UsageInformation(UsageCategory.REUSE)
public abstract class AbstractCustomNameMapper<T> implements NameMapper<T>
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private NameMapper<T> customNameMapper;
protected AbstractCustomNameMapper()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public String createName(T source)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.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/core/metadata/MetaDataEntry.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/core/metadata/MetaDataEntry.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java Sat Apr 3 00:28:26 2010
@@ -20,11 +20,10 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Map;
import java.util.HashMap;
+import java.util.logging.Logger;
/**
* Data holder which stores the meta-data and some information where the meta-data was around.
@@ -35,7 +34,7 @@ import java.util.HashMap;
@UsageInformation(UsageCategory.API)
public class MetaDataEntry
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private String key;
private Object value;
@@ -48,10 +47,7 @@ public class MetaDataEntry
public void setKey(String key)
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("setting meta-data key: " + key);
- }
+ this.logger.finest("setting meta-data key: " + key);
this.key = key;
}
@@ -68,10 +64,7 @@ public class MetaDataEntry
public void setValue(Object value)
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("setting meta-data value: " + value);
- }
+ this.logger.finest("setting meta-data value: " + value);
this.value = value;
}
@@ -93,10 +86,7 @@ public class MetaDataEntry
public void setProperty(String key, Object value)
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("new property added key: " + key + " value: " + value + " for metadata-key: " + this.key);
- }
+ this.logger.finest("new property added key: " + key + " value: " + value + " for metadata-key: " + this.key);
this.properties.put(key, value);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.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/core/metadata/extractor/DefaultComponentMetaDataExtractor.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/core/metadata/extractor/DefaultComponentMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractor.java Sat Apr 3 00:28:26 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.extractor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.property.DefaultPropertyInformation;
@@ -46,6 +44,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Logger;
+import java.util.logging.Level;
/**
* Default implementation which extracts meta-data (e.g. the annotations) of the value binding of a component.
@@ -58,14 +58,11 @@ import java.util.List;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultComponentMetaDataExtractor implements MetaDataExtractor
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public DefaultComponentMetaDataExtractor()
{
- if (logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
@ToDo(Priority.MEDIUM)
@@ -76,19 +73,16 @@ public class DefaultComponentMetaDataExt
//should never occur
if (!(object instanceof UIComponent))
{
- if (this.logger.isWarnEnabled() && object != null)
+ if (object != null)
{
- this.logger.warn(object.getClass() + " is no valid component");
+ this.logger.warning(object.getClass() + " is no valid component");
}
return propertyInformation;
}
UIComponent uiComponent = (UIComponent) object;
- if (logger.isTraceEnabled())
- {
- logger.trace("start extracting meta-data of " + uiComponent.getClass().getName());
- }
+ logger.finest("start extracting meta-data of " + uiComponent.getClass().getName());
PropertyDetails propertyDetails = ExtValUtils.getELHelper().getPropertyDetailsOfValueBinding(uiComponent);
@@ -118,10 +112,7 @@ public class DefaultComponentMetaDataExt
cacheMetaData(propertyInformation);
}
- if (logger.isTraceEnabled())
- {
- logger.trace("extract finished");
- }
+ logger.finest("extract finished");
return propertyInformation;
}
@@ -281,11 +272,8 @@ public class DefaultComponentMetaDataExt
}
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;
}
@@ -326,10 +314,7 @@ public class DefaultComponentMetaDataExt
}
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;
}
@@ -359,10 +344,7 @@ public class DefaultComponentMetaDataExt
{
propertyInformation.addMetaDataEntry(createMetaDataEntryForAnnotation(annotation));
- if (logger.isTraceEnabled())
- {
- logger.trace(annotation.getClass().getName() + " found");
- }
+ logger.finest(annotation.getClass().getName() + " found");
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractorFactory.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/core/metadata/extractor/DefaultComponentMetaDataExtractorFactory.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/core/metadata/extractor/DefaultComponentMetaDataExtractorFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultComponentMetaDataExtractorFactory.java Sat Apr 3 00:28:26 2010
@@ -27,12 +27,11 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.Priority;
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 java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
/**
* This factory creates a meta-data extractor which extracts the meta-data
@@ -51,16 +50,13 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultComponentMetaDataExtractorFactory implements ComponentMetaDataExtractorFactory
{
- private final Log logger = LogFactory.getLog(getClass());
+ private final Logger logger = Logger.getLogger(getClass().getName());
private static MetaDataExtractor metaDataExtractor = null;
public DefaultComponentMetaDataExtractorFactory()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
@ToDo(value = Priority.MEDIUM, description = "logging")
@@ -92,10 +88,7 @@ public class DefaultComponentMetaDataExt
}
}
- if(logger.isTraceEnabled())
- {
- logger.trace(metaDataExtractor.getClass().getName() + " created");
- }
+ logger.finest(metaDataExtractor.getClass().getName() + " created");
return ExtValUtils.createInterceptedMetaDataExtractorWith(metaDataExtractor, properties);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.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/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.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/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java Sat Apr 3 00:28:26 2010
@@ -21,10 +21,9 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.Map;
+import java.util.logging.Logger;
/**
* it's just a helper for proxies - you just need it, if you define the equivalent validation strategy as bean and
@@ -41,7 +40,7 @@ import java.util.Map;
@UsageInformation({UsageCategory.REUSE})
public class BeanMetaDataTransformerAdapterImpl implements MetaDataTransformer, BeanMetaDataTransformerAdapter
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private MetaDataTransformer metaDataTransformer;
private String metaDataTransformerClassName;
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.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/core/metadata/transformer/DefaultMetaDataTransformerFactory.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/core/metadata/transformer/DefaultMetaDataTransformerFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/DefaultMetaDataTransformerFactory.java Sat Apr 3 00:28:26 2010
@@ -36,13 +36,12 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.ProxyUtils;
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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
/**
@@ -59,7 +58,7 @@ import java.util.Map;
public class DefaultMetaDataTransformerFactory extends AbstractNameMapperAwareFactory<ValidationStrategy>
implements ClassMappingFactory<ValidationStrategy, MetaDataTransformer>
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private Map<String, String> validationStrategyToMetaDataTransformerMapping;
private List<NameMapper<ValidationStrategy>> nameMapperList = new ArrayList<NameMapper<ValidationStrategy>>();
@@ -68,10 +67,7 @@ public class DefaultMetaDataTransformerF
public DefaultMetaDataTransformerFactory()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
//since there is no guarantee that the startup listener of the core gets executed first
register(new ValidationStrategyToMetaDataTransformerSubMapperAwareNameMapper());
@@ -217,11 +213,8 @@ public class DefaultMetaDataTransformerF
private synchronized void addMapping(String validationStrategyName, String transformerName)
{
- if(logger.isTraceEnabled())
- {
- logger.trace("adding validation strategy to meta-data transformer mapping: "
- + validationStrategyName + " -> " + transformerName);
- }
+ logger.finest("adding validation strategy to meta-data transformer mapping: "
+ + validationStrategyName + " -> " + transformerName);
validationStrategyToMetaDataTransformerMapping.put(validationStrategyName, transformerName);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/AbstractValidationStrategyToMetaDataTransformerNameMapper.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/core/metadata/transformer/mapper/AbstractValidationStrategyToMetaDataTransformerNameMapper.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/core/metadata/transformer/mapper/AbstractValidationStrategyToMetaDataTransformerNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/AbstractValidationStrategyToMetaDataTransformerNameMapper.java Sat Apr 3 00:28:26 2010
@@ -22,8 +22,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
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 java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -33,13 +33,10 @@ import org.apache.commons.logging.LogFac
public abstract class AbstractValidationStrategyToMetaDataTransformerNameMapper
implements NameMapper<ValidationStrategy>
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public AbstractValidationStrategyToMetaDataTransformerNameMapper()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
-}
+}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.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/core/property/DefaultPropertyInformation.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/core/property/DefaultPropertyInformation.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java Sat Apr 3 00:28:26 2010
@@ -21,13 +21,12 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -36,7 +35,7 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultPropertyInformation implements PropertyInformation
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private Map<String, Object> informationMap = new HashMap<String, Object>();
private List<MetaDataEntry> metaDataList = new ArrayList<MetaDataEntry>();
@@ -58,10 +57,7 @@ public class DefaultPropertyInformation
public void setInformation(String key, Object value)
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("new information added key: " + key + " value: " + value);
- }
+ this.logger.finest("new information added key: " + key + " value: " + value);
informationMap.put(key, value);
}
@@ -79,10 +75,7 @@ public class DefaultPropertyInformation
public void resetMetaDataEntries()
{
- if(this.logger.isTraceEnabled())
- {
- this.logger.trace("resetting meta-data entries");
- }
+ this.logger.finest("resetting meta-data entries");
this.metaDataList.clear();
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/proxy/DefaultProxyHelper.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/core/proxy/DefaultProxyHelper.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/core/proxy/DefaultProxyHelper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/proxy/DefaultProxyHelper.java Sat Apr 3 00:28:26 2010
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.extensions.validator.core.proxy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import java.util.logging.Logger;
+
/**
* @author Gerhard Petracek
* @since x.x.3
@@ -30,14 +30,11 @@ import org.apache.myfaces.extensions.val
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultProxyHelper implements ProxyHelper
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
public DefaultProxyHelper()
{
- if (logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public <T> Class<T> getUnproxiedClass(Class currentClass, Class<T> targetType)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.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/core/renderkit/AbstractRenderKitWrapperFactory.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/core/renderkit/AbstractRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java Sat Apr 3 00:28:26 2010
@@ -22,10 +22,9 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.factory.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.util.JsfUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.render.RenderKit;
+import java.util.logging.Logger;
/**
* Base for all RenderKitWrapperFactories to force a specific behaviour
@@ -36,25 +35,19 @@ import javax.faces.render.RenderKit;
@UsageInformation(UsageCategory.API)
public abstract class AbstractRenderKitWrapperFactory implements ClassMappingFactory<RenderKit, RenderKit>
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
protected AbstractRenderKitWrapperFactory wrapped;
private boolean deactivated = false;
protected AbstractRenderKitWrapperFactory()
{
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public void addRenderKitWrapperFactory(AbstractRenderKitWrapperFactory renderKitWrapperFactory)
{
- if(logger.isTraceEnabled())
- {
- logger.trace(renderKitWrapperFactory.getClass().getName() + " added");
- }
+ logger.finest(renderKitWrapperFactory.getClass().getName() + " added");
if(this.wrapped != null)
{
@@ -67,10 +60,7 @@ public abstract class AbstractRenderKitW
public void deactivate()
{
- if(logger.isTraceEnabled())
- {
- logger.trace(getClass().getName() + " deactivated");
- }
+ logger.finest(getClass().getName() + " deactivated");
this.deactivated = true;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.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/core/renderkit/DefaultRenderKitWrapperFactory.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/core/renderkit/DefaultRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java Sat Apr 3 00:28:26 2010
@@ -38,10 +38,7 @@ public class DefaultRenderKitWrapperFact
protected RenderKit createWrapper(RenderKit renderKit)
{
- if(logger.isTraceEnabled())
- {
- logger.trace("extval renderkit wrapper created for " + renderKit.getClass().getName());
- }
+ logger.finest("extval renderkit wrapper created for " + renderKit.getClass().getName());
//workaround for mojarra (EXTVAL-38)
if(useGenericRenderKitWrapperFactory == null)
@@ -63,4 +60,4 @@ public class DefaultRenderKitWrapperFact
}
return this.renderKit;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.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/core/renderkit/ExtValLazyRendererProxy.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/core/renderkit/ExtValLazyRendererProxy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.java Sat Apr 3 00:28:26 2010
@@ -22,8 +22,6 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
@@ -31,6 +29,7 @@ import javax.faces.component.UIComponent
import javax.faces.convert.ConverterException;
import java.io.IOException;
import java.lang.reflect.Constructor;
+import java.util.logging.Logger;
/**
* to support a custom proxy
@@ -41,7 +40,7 @@ import java.lang.reflect.Constructor;
@UsageInformation(UsageCategory.INTERNAL)
class ExtValLazyRendererProxy extends Renderer
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
private Renderer wrapped;
@@ -49,10 +48,7 @@ class ExtValLazyRendererProxy extends Re
{
this.wrapped = renderer;
- if(logger.isTraceEnabled())
- {
- logger.trace("simple proxy created for " + renderer.getClass().getName());
- }
+ logger.finest("simple proxy created for " + renderer.getClass().getName());
}
@Override
@@ -122,12 +118,9 @@ class ExtValLazyRendererProxy extends Re
Constructor constructor = targetClass.getConstructor(argClasses);
return (Renderer)constructor.newInstance(this.wrapped);
}
- catch (Throwable t)
+ catch (Exception e)
{
- if(logger.isWarnEnabled())
- {
- logger.warn("couldn't create: " + targetClass.getName());
- }
+ logger.warning("couldn't create: " + targetClass.getName());
return this.wrapped;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.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/core/renderkit/ExtValRenderKit.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/core/renderkit/ExtValRenderKit.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java Sat Apr 3 00:28:26 2010
@@ -20,8 +20,6 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
@@ -30,6 +28,7 @@ import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
import java.io.OutputStream;
import java.io.Writer;
+import java.util.logging.Logger;
/**
* @author Gerhard Petracek
@@ -38,17 +37,14 @@ import java.io.Writer;
@UsageInformation(UsageCategory.INTERNAL)
public class ExtValRenderKit extends RenderKit
{
- protected final Log logger = LogFactory.getLog(getClass());
+ protected final Logger logger = Logger.getLogger(getClass().getName());
protected RenderKit wrapped;
public ExtValRenderKit(RenderKit wrapped)
{
this.wrapped = wrapped;
- if(logger.isDebugEnabled())
- {
- logger.debug(getClass().getName() + " instantiated");
- }
+ logger.fine(getClass().getName() + " instantiated");
}
public void addRenderer(String family, String rendererType, Renderer renderer)
@@ -72,10 +68,7 @@ public class ExtValRenderKit extends Ren
return renderer instanceof ExtValRendererWrapper ? renderer : createWrapper(renderer);
}
- if(this.logger.isWarnEnabled())
- {
- this.logger.warn("no renderer found for family " + family + " and type " + rendererType);
- }
+ this.logger.warning("no renderer found for family " + family + " and type " + rendererType);
return renderer;
}