myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r930447 [2/3] - in /myfaces/extensions/validator/branches/branch_for_jsf_2_0: component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ component-support/trinidad-support/src/main/java/org/ap...
Date Sat, 03 Apr 2010 00:33:07 GMT
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/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_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java Sat Apr  3 00:33:05 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;
@@ -32,6 +30,7 @@ import javax.faces.render.ClientBehavior
 import java.io.OutputStream;
 import java.io.Writer;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * @author Gerhard Petracek
@@ -40,17 +39,14 @@ import java.util.Iterator;
 @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)
@@ -74,10 +70,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;
     }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java Sat Apr  3 00:33:05 2010
@@ -26,13 +26,12 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.util.ClassUtils;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.ExtValInformation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import javax.faces.render.RenderKitFactory;
 import javax.faces.render.RenderKit;
 import javax.faces.context.FacesContext;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * central mechanism which is responsible to create a wrapper for a renderer - starting point of extval.
@@ -43,7 +42,7 @@ import java.util.Iterator;
 @UsageInformation(UsageCategory.INTERNAL)
 public class ExtValRenderKitFactory extends RenderKitFactory
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
     private RenderKitFactory wrapped;
     private AbstractRenderKitWrapperFactory defaultRenderKitWrapperFactory;
     private Boolean isDeactivated;
@@ -52,10 +51,7 @@ public class ExtValRenderKitFactory exte
     {
         this.wrapped = renderKitFactory;
 
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public void addRenderKit(String s, RenderKit renderKit)

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java Sat Apr  3 00:33:05 2010
@@ -25,8 +25,6 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.JsfProjectStage;
 import org.apache.myfaces.extensions.validator.util.ExtValUtils;
 import org.apache.myfaces.extensions.validator.util.ProxyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import javax.faces.context.FacesContext;
 import javax.faces.render.Renderer;
@@ -34,6 +32,7 @@ import javax.faces.component.UIComponent
 import javax.faces.convert.ConverterException;
 import javax.faces.application.FacesMessage;
 import java.io.IOException;
+import java.util.logging.Logger;
 
 /**
  * to avoid multiple calls of renderer methods within renderer interceptors (e.g. for encode, decode,...)
@@ -45,18 +44,15 @@ import java.io.IOException;
 public class ExtValRendererProxy extends Renderer
 {
     public static final String KEY = ExtValRendererProxy.class.getName() + ":KEY";
-    protected final Log logger = LogFactory.getLog(getClass());
-    
+    protected final Logger logger = Logger.getLogger(getClass().getName());
+
     protected Renderer wrapped;
 
     public ExtValRendererProxy(Renderer renderer)
     {
         this.wrapped = renderer;
 
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("proxy created for " + renderer.getClass().getName());
-        }
+        logger.finest("proxy created for " + renderer.getClass().getName());
     }
 
     @Override
@@ -276,15 +272,9 @@ public class ExtValRendererProxy extends
             FacesContext.getCurrentInstance()
                     .addMessage(null, ExtValUtils.createFacesMessage(FacesMessage.SEVERITY_WARN, message, message));
 
-            if(logger.isWarnEnabled())
-            {
-                logger.warn(message);
-            }
+            logger.warning(message);
         }
 
-        if(logger.isDebugEnabled())
-        {
-            logger.debug("turn on the development mode for further information, if something is displayed wrong.");
-        }
+        logger.fine("turn on the development mode for further information, if something is displayed wrong.");
     }
 }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererWrapper.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererWrapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererWrapper.java Sat Apr  3 00:33:05 2010
@@ -26,8 +26,6 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipAfterInterceptorsException;
 import org.apache.myfaces.extensions.validator.core.renderkit.exception.SkipRendererDelegationException;
 import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -35,6 +33,8 @@ import javax.faces.convert.ConverterExce
 import javax.faces.render.Renderer;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * Default approach to avoid proxies for converters and the adapter fallback.
@@ -52,7 +52,7 @@ import java.lang.reflect.Constructor;
 @UsageInformation(UsageCategory.INTERNAL)
 public class ExtValRendererWrapper extends Renderer
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     protected Renderer wrapped;
     protected ExtValContext extValContext = ExtValContext.getContext();
@@ -63,10 +63,7 @@ public class ExtValRendererWrapper exten
 
         if(proxyClassName == null)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("no extval renderer proxy configured");
-            }
+            logger.finest("no extval renderer proxy configured");
 
             this.wrapped = new ExtValLazyRendererProxy(renderer);
             return;
@@ -76,10 +73,7 @@ public class ExtValRendererWrapper exten
 
         if(targetClass == null)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("no extval renderer proxy configured");
-            }
+            logger.finest("no extval renderer proxy configured");
 
             this.wrapped = new ExtValLazyRendererProxy(renderer);
             return;
@@ -95,16 +89,10 @@ public class ExtValRendererWrapper exten
         }
         catch (Throwable e)
         {
-            if(logger.isWarnEnabled())
-            {
-                logger.warn("no extval renderer proxy created for " + renderer.getClass().getName());
-            }
+            logger.warning("no extval renderer proxy created for " + renderer.getClass().getName());
         }
 
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("extval renderer wrapper created for " + renderer.getClass().getName());
-        }
+        logger.finest("extval renderer wrapper created for " + renderer.getClass().getName());
     }
 
     @Override
@@ -116,10 +104,7 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start beforeDecode of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start beforeDecode of " + rendererInterceptor.getClass().getName());
 
                 try
                 {
@@ -127,10 +112,7 @@ public class ExtValRendererWrapper exten
                 }
                 catch (SkipRendererDelegationException e)
                 {
-                    if(logger.isTraceEnabled())
-                    {
-                        logger.trace("decode delegation canceled", e);
-                    }
+                    logger.log(Level.FINEST, "decode delegation canceled", e);
 
                     delegateToWrappedRenderer = false;
 
@@ -140,18 +122,12 @@ public class ExtValRendererWrapper exten
                     }
                 }
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("beforeDecode of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("beforeDecode of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch(SkipBeforeInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("beforeDecode interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "beforeDecode interceptors canceled", e);
         }
 
         /*
@@ -166,25 +142,16 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start afterDecode of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start afterDecode of " + rendererInterceptor.getClass().getName());
 
                 rendererInterceptor.afterDecode(facesContext, uiComponent, this.wrapped);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("afterDecode of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("afterDecode of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipAfterInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("afterDecode interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "afterDecode interceptors canceled", e);
         }
     }
 
@@ -198,10 +165,7 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start beforeEncodeBegin of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start beforeEncodeBegin of " + rendererInterceptor.getClass().getName());
 
                 try
                 {
@@ -209,10 +173,7 @@ public class ExtValRendererWrapper exten
                 }
                 catch (SkipRendererDelegationException e)
                 {
-                    if(logger.isTraceEnabled())
-                    {
-                        logger.trace("encodeBegin delegation canceled", e);
-                    }
+                    logger.log(Level.FINEST, "encodeBegin delegation canceled", e);
 
                     delegateToWrappedRenderer = false;
 
@@ -222,18 +183,12 @@ public class ExtValRendererWrapper exten
                     }
                 }
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("beforeEncodeBegin of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("beforeEncodeBegin of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipBeforeInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("beforeEncodeBegin interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "beforeEncodeBegin interceptors canceled", e);
         }
 
         /*
@@ -248,25 +203,16 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start afterEncodeBegin of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start afterEncodeBegin of " + rendererInterceptor.getClass().getName());
 
-                    rendererInterceptor.afterEncodeBegin(facesContext, uiComponent, this.wrapped);
+                rendererInterceptor.afterEncodeBegin(facesContext, uiComponent, this.wrapped);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("afterEncodeBegin of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("afterEncodeBegin of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipAfterInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("afterEncodeBegin interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "afterEncodeBegin interceptors canceled", e);
         }
     }
 
@@ -280,10 +226,7 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start beforeEncodeChildren of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start beforeEncodeChildren of " + rendererInterceptor.getClass().getName());
 
                 try
                 {
@@ -291,10 +234,7 @@ public class ExtValRendererWrapper exten
                 }
                 catch (SkipRendererDelegationException e)
                 {
-                    if(logger.isTraceEnabled())
-                    {
-                        logger.trace("encodeChildren delegation canceled", e);
-                    }
+                    logger.log(Level.FINEST, "encodeChildren delegation canceled", e);
 
                     delegateToWrappedRenderer = false;
 
@@ -304,19 +244,13 @@ public class ExtValRendererWrapper exten
                     }
                 }
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("beforeEncodeChildren of " +
-                        rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("beforeEncodeChildren of " +
+                    rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipBeforeInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("beforeEncodeChildren interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "beforeEncodeChildren interceptors canceled", e);
         }
 
         /*
@@ -331,25 +265,16 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start afterEncodeChildren of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start afterEncodeChildren of " + rendererInterceptor.getClass().getName());
 
                 rendererInterceptor.afterEncodeChildren(facesContext, uiComponent, this.wrapped);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("afterEncodeChildren of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("afterEncodeChildren of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipAfterInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("afterEncodeChildren interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "afterEncodeChildren interceptors canceled", e);
         }
     }
 
@@ -363,10 +288,7 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start beforeEncodeEnd of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start beforeEncodeEnd of " + rendererInterceptor.getClass().getName());
 
                 try
                 {
@@ -374,10 +296,7 @@ public class ExtValRendererWrapper exten
                 }
                 catch (SkipRendererDelegationException e)
                 {
-                    if(logger.isTraceEnabled())
-                    {
-                        logger.trace("encodeEnd delegation canceled", e);
-                    }
+                    logger.log(Level.FINEST, "encodeEnd delegation canceled", e);
 
                     delegateToWrappedRenderer = false;
 
@@ -387,18 +306,12 @@ public class ExtValRendererWrapper exten
                     }
                 }
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("beforeEncodeEnd of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("beforeEncodeEnd of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipBeforeInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("beforeEncodeEnd interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "beforeEncodeEnd interceptors canceled", e);
         }
 
         /*
@@ -413,25 +326,16 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start afterEncodeEnd of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start afterEncodeEnd of " + rendererInterceptor.getClass().getName());
 
                 rendererInterceptor.afterEncodeEnd(facesContext, uiComponent, this.wrapped);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("afterEncodeEnd of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("afterEncodeEnd of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipAfterInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("afterEncodeEnd interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "afterEncodeEnd interceptors canceled", e);
         }
     }
 
@@ -458,10 +362,7 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start beforeGetConvertedValue of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start beforeGetConvertedValue of " + rendererInterceptor.getClass().getName());
 
                 try
                 {
@@ -471,10 +372,7 @@ public class ExtValRendererWrapper exten
                 {
                     convertedObject = e.getReturnValueOnException(convertedObject);
 
-                    if(logger.isTraceEnabled())
-                    {
-                        logger.trace("getConvertedValue delegation canceled", e);
-                    }
+                    logger.log(Level.FINEST, "getConvertedValue delegation canceled", e);
 
                     delegateToWrappedRenderer = false;
 
@@ -484,19 +382,13 @@ public class ExtValRendererWrapper exten
                     }
                 }
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("beforeGetConvertedValue of " +
-                        rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("beforeGetConvertedValue of " +
+                    rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipBeforeInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("beforeGetConvertedValue interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "beforeGetConvertedValue interceptors canceled", e);
         }
 
         /*
@@ -511,25 +403,16 @@ public class ExtValRendererWrapper exten
         {
             for(RendererInterceptor rendererInterceptor : extValContext.getRendererInterceptors())
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("start afterGetConvertedValue of " + rendererInterceptor.getClass().getName());
-                }
+                logger.finest("start afterGetConvertedValue of " + rendererInterceptor.getClass().getName());
 
                 rendererInterceptor.afterGetConvertedValue(facesContext, uiComponent, o, this.wrapped);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("afterGetConvertedValue of " + rendererInterceptor.getClass().getName() + " finished");
-                }
+                logger.finest("afterGetConvertedValue of " + rendererInterceptor.getClass().getName() + " finished");
             }
         }
         catch (SkipAfterInterceptorsException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("afterGetConvertedValue interceptors canceled", e);
-            }
+            logger.log(Level.FINEST, "afterGetConvertedValue interceptors canceled", e);
         }
 
         return convertedObject;

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java Sat Apr  3 00:33:05 2010
@@ -26,14 +26,14 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.core.ProjectStageResolver;
 import org.apache.myfaces.extensions.validator.core.DefaultProjectStageResolver;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
 
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * In order to execute logic just once.
@@ -45,7 +45,7 @@ import java.util.List;
 @UsageInformation(UsageCategory.REUSE)
 public abstract class AbstractStartupListener implements PhaseListener
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     //don't remove - it's a fallback if there is a problem with deregistration
     //target: don't process init logic more than once
@@ -55,10 +55,7 @@ public abstract class AbstractStartupLis
 
     protected AbstractStartupListener()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public void afterPhase(PhaseEvent event)
@@ -73,10 +70,7 @@ public abstract class AbstractStartupLis
             {
                 try
                 {
-                    if(logger.isInfoEnabled())
-                    {
-                        logger.info("start init of " + getClass().getName());
-                    }
+                    logger.info("start init of " + getClass().getName());
 
                     try
                     {
@@ -88,32 +82,24 @@ public abstract class AbstractStartupLis
                         }
                         else
                         {
-                            if(logger.isInfoEnabled())
-                            {
-                                logger.info("init of " + getClass().getName() + " deactivated");
-                            }
+                            logger.info("init of " + getClass().getName() + " deactivated");
                         }
 
-                        if(logger.isInfoEnabled())
-                        {
-                            logger.info("init of " + getClass().getName() + " finished");
-                        }
+                        logger.info("init of " + getClass().getName() + " finished");
                     }
                     finally
                     {
                         JsfUtils.deregisterPhaseListener(this);
                     }
                 }
-                catch (Throwable t)
+                catch (Exception e)
                 {
-                    if(logger.isWarnEnabled())
-                    {
-                        logger.warn("an exception occurred while deregistering the phase-listener"
+                        logger.log(Level.WARNING,
+                                "an exception occurred while deregistering the phase-listener"
                                 + getClass().getName()
                                 + " -> there is just a little overhead,"
                                 + " but everything else works correctly."
-                                + " however, please inform the community about your configuration", t);
-                    }
+                                + " however, please inform the community about your configuration", e);
                 }
                 finally
                 {

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ExtValStartupListener.java Sat Apr  3 00:33:05 2010
@@ -82,16 +82,13 @@ public class ExtValStartupListener exten
 
     protected void init()
     {
-        if(logger.isInfoEnabled())
+        if(ExtValInformation.VERSION != null)
         {
-            if(ExtValInformation.VERSION != null)
-            {
-                logger.info("starting up MyFaces Extensions Validator v" + ExtValInformation.VERSION);
-            }
-            else
-            {
-                logger.info("starting up MyFaces Extensions Validator");
-            }
+            logger.info("starting up MyFaces Extensions Validator v" + ExtValInformation.VERSION);
+        }
+        else
+        {
+            logger.info("starting up MyFaces Extensions Validator");
         }
 
         ExtValContext.getContext().registerRendererInterceptor(new ValidationInterceptor());
@@ -177,17 +174,11 @@ public class ExtValStartupListener exten
 
         if(customStartupListener != null)
         {
-            if(logger.isInfoEnabled())
-            {
-                logger.info("start init of " + customStartupListener.getClass().getName());
-            }
+            logger.info("start init of " + customStartupListener.getClass().getName());
 
             customStartupListener.init();
 
-            if(logger.isInfoEnabled())
-            {
-                logger.info("init of " + customStartupListener.getClass().getName() + " finished");
-            }
+            logger.info("init of " + customStartupListener.getClass().getName() + " finished");
         }
     }
 

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/AbstractStorageManager.java Sat Apr  3 00:33:05 2010
@@ -24,12 +24,11 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.util.ProxyUtils;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.REUSE;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * generic storage manager implementation
@@ -41,16 +40,13 @@ import java.util.Map;
 public abstract class AbstractStorageManager<T> extends AbstractNameMapperAwareFactory<String>
         implements StorageManager<T>
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private List<NameMapper<String>> nameMapperList = new ArrayList<NameMapper<String>>();
 
     public AbstractStorageManager()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public T create(String storageName)

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultGroupStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultGroupStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultGroupStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultGroupStorage.java Sat Apr  3 00:33:05 2010
@@ -21,13 +21,12 @@ package org.apache.myfaces.extensions.va
 import org.apache.myfaces.extensions.validator.util.GroupUtils;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.logging.Logger;
 
 /**
  * default storage implementation for groups
@@ -38,7 +37,7 @@ import java.util.ArrayList;
 @UsageInformation(INTERNAL)
 public class DefaultGroupStorage implements GroupStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, List<Class>> addedGroups = new HashMap<String, List<Class>>();
 
@@ -78,12 +77,9 @@ public class DefaultGroupStorage impleme
         {
             if(resultsForComponent.length == 0)
             {
-                if(this.logger.isDebugEnabled())
-                {
-                    this.logger.debug("no groups for group-validation available." +
-                            "maybe you restricted all groups or you aren't using groups." +
-                            "bean validation will use the default group for validation");
-                }
+                this.logger.fine("no groups for group-validation available." +
+                        "maybe you restricted all groups or you aren't using groups." +
+                        "bean validation will use the default group for validation");
             }
             return resultsForComponent;
         }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMappedConstraintSourceStorage.java Sat Apr  3 00:33:05 2010
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.extensions.validator.core.storage;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.extensions.validator.core.property.PropertyDetails;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -28,6 +26,7 @@ import org.apache.myfaces.extensions.val
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.logging.Logger;
 
 /**
  * @author Gerhard Petracek
@@ -36,7 +35,7 @@ import java.util.ResourceBundle;
 @UsageInformation(INTERNAL)
 public class DefaultMappedConstraintSourceStorage implements MappedConstraintSourceStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, Map<String, PropertyDetails>> propertyDetailsMap =
             new HashMap<String, Map<String, PropertyDetails>>();

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultMetaDataStorage.java Sat Apr  3 00:33:05 2010
@@ -32,13 +32,12 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.util.ClassUtils;
 import org.apache.myfaces.extensions.validator.util.ProxyUtils;
-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
@@ -47,7 +46,7 @@ import java.util.ArrayList;
 @UsageInformation(INTERNAL)
 public class DefaultMetaDataStorage implements MetaDataStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, Map<String, PropertyInformation>> cachedPropertyInformation =
             new HashMap<String, Map<String, PropertyInformation>>();
@@ -198,18 +197,12 @@ public class DefaultMetaDataStorage impl
 
     private void logAddedFilter(Class<? extends MetaDataStorageFilter> filterClass)
     {
-        if(this.logger.isInfoEnabled())
-        {
-            this.logger.info(filterClass.getName() + " added");
-        }
+        this.logger.info(filterClass.getName() + " added");
     }
 
     private void logRemovedFilter(Class<? extends MetaDataStorageFilter> filterClass)
     {
-        if(this.logger.isInfoEnabled())
-        {
-            this.logger.info(filterClass.getName() + " removed");
-        }
+        this.logger.info(filterClass.getName() + " removed");
     }
 
     private Map<String, PropertyInformation> getMapForClass(Class target)

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultPropertyStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultPropertyStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultPropertyStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultPropertyStorage.java Sat Apr  3 00:33:05 2010
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.extensions.validator.core.storage;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.util.ProxyUtils;
@@ -28,6 +26,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * @author Gerhard Petracek
@@ -36,7 +35,7 @@ import java.util.Map;
 @UsageInformation(INTERNAL)
 public class DefaultPropertyStorage implements PropertyStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, Map<String, Field>> fieldMap = new HashMap<String, Map<String, Field>>();
     private Map<String, Map<String, Method>> methodMap = new HashMap<String, Map<String, Method>>();

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultRendererInterceptorPropertyStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultRendererInterceptorPropertyStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultRendererInterceptorPropertyStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultRendererInterceptorPropertyStorage.java Sat Apr  3 00:33:05 2010
@@ -20,11 +20,10 @@ package org.apache.myfaces.extensions.va
 
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
-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;
 
 /**
  * @author Gerhard Petracek
@@ -33,7 +32,7 @@ import java.util.HashMap;
 @UsageInformation(INTERNAL)
 public class DefaultRendererInterceptorPropertyStorage implements RendererInterceptorPropertyStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, Object> properties = new HashMap<String, Object>();
 

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultStorageManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultStorageManagerFactory.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultStorageManagerFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultStorageManagerFactory.java Sat Apr  3 00:33:05 2010
@@ -27,14 +27,13 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.logging.Logger;
 
 /**
  * default implementation for storage-manager creation and caching
@@ -46,7 +45,7 @@ import java.util.HashMap;
 public class DefaultStorageManagerFactory extends AbstractNameMapperAwareFactory<Class>
         implements ClassMappingFactory<Class, StorageManager>, StorageManagerHolder
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private boolean lazyStaticMappingApplied = false;
     private List<NameMapper<Class>> nameMapperList = new ArrayList<NameMapper<Class>>();
@@ -54,10 +53,7 @@ public class DefaultStorageManagerFactor
 
     public DefaultStorageManagerFactory()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
 
         setStorageManager(RendererProxyStorage.class,
                 new DefaultRendererProxyStorageManager(), false);
@@ -116,19 +112,13 @@ public class DefaultStorageManagerFactor
         if(storageType == null)
         {
             isValidEntry = false;
-            if(this.logger.isErrorEnabled())
-            {
-                this.logger.error("you tried to add an invalid storage type");
-            }
+            this.logger.severe("you tried to add an invalid storage type");
         }
 
         if(storageManager == null)
         {
             isValidEntry = false;
-            if(this.logger.isErrorEnabled())
-            {
-                this.logger.error("you tried to add an invalid storage manager");
-            }
+            this.logger.severe("you tried to add an invalid storage manager");
         }
 
         if(!isValidEntry)
@@ -172,11 +162,8 @@ public class DefaultStorageManagerFactor
                 (this.storageTypeToStorageManagerMap.containsKey(storageType) && override))
         {
 
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("adding type to storage-manager mapping: "
-                    + storageType.getName() + " -> " + storageManager.getClass().getName());
-            }
+            logger.finest("adding type to storage-manager mapping: "
+                + storageType.getName() + " -> " + storageManager.getClass().getName());
 
             this.storageTypeToStorageManagerMap.put(storageType, storageManager);
         }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultViolationSeverityInterpreterStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultViolationSeverityInterpreterStorage.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultViolationSeverityInterpreterStorage.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/storage/DefaultViolationSeverityInterpreterStorage.java Sat Apr  3 00:33:05 2010
@@ -18,12 +18,12 @@
  */
 package org.apache.myfaces.extensions.validator.core.storage;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.extensions.validator.core.validation.parameter.ViolationSeverityInterpreter;
 import static org.apache.myfaces.extensions.validator.internal.UsageCategory.INTERNAL;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 
+import java.util.logging.Logger;
+
 /**
  * @author Gerhard Petracek
  * @since x.x.3
@@ -31,7 +31,7 @@ import org.apache.myfaces.extensions.val
 @UsageInformation(INTERNAL)
 public class DefaultViolationSeverityInterpreterStorage implements ViolationSeverityInterpreterStorage
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private ViolationSeverityInterpreter violationSeverityInterpreter;
 

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java Sat Apr  3 00:33:05 2010
@@ -24,12 +24,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.LogFactory;
-import org.apache.commons.logging.Log;
 
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * MessageResolver which uses property files.
@@ -44,7 +44,7 @@ public abstract class AbstractValidation
 {
     public static final String MISSING_RESOURCE_MARKER = "???";
 
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private static String deactivateDefaultConvention = WebXmlParameter.DEACTIVATE_DEFAULT_CONVENTION;
     private static ResourceBundle defaultBundle = null;
@@ -54,10 +54,7 @@ public abstract class AbstractValidation
 
     protected AbstractValidationErrorMessageResolver()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public String getMessage(String key, Locale locale)
@@ -82,7 +79,7 @@ public abstract class AbstractValidation
         {
             customMessage = tryToFindCustomMessage(key, locale);
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing
         }
@@ -99,7 +96,7 @@ public abstract class AbstractValidation
         {
             customMessage = tryToUseMessageBundleConvention(key, locale);
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing
         }
@@ -118,7 +115,7 @@ public abstract class AbstractValidation
         {
             customMessage = tryToFindCustomMessageInCustomResourceBundle(key, locale);
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -141,10 +138,7 @@ public abstract class AbstractValidation
             }
             else
             {
-                if(logger.isWarnEnabled())
-                {
-                    logger.warn("message bundle " + this.messageBundleBaseName + " not found");
-                }
+                logger.warning("message bundle " + this.messageBundleBaseName + " not found");
             }
         }
 
@@ -159,10 +153,7 @@ public abstract class AbstractValidation
             }
             else
             {
-                if(logger.isWarnEnabled())
-                {
-                    logger.warn("message bundle var name " + this.messageBundleVarName + " not found");
-                }
+                logger.warning("message bundle var name " + this.messageBundleVarName + " not found");
             }
         }
 
@@ -181,7 +172,7 @@ public abstract class AbstractValidation
                     defaultBundle = ResourceBundle.getBundle(ExtValContext.getContext().getInformationProviderBean()
                         .get(CustomInformation.MESSAGE_BUNDLE_NAME), locale);
                 }
-                catch (Throwable t)
+                catch (Exception e)
                 {
                     //do nothing
                     deactivateDefaultConvention = "true";
@@ -209,10 +200,7 @@ public abstract class AbstractValidation
             }
             catch (MissingResourceException e)
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace("no custom message for " + key + " within " + getCustomBaseName(), e);
-                }
+                logger.log(Level.FINEST, "no custom message for " + key + " within " + getCustomBaseName(), e);
             }
         }
         return null;

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java Sat Apr  3 00:33:05 2010
@@ -32,13 +32,12 @@ 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.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * Factory which creates a MessageResolver for a given ValidationStrategy
@@ -51,17 +50,14 @@ import java.util.Map;
 public class DefaultMessageResolverFactory extends AbstractNameMapperAwareFactory<ValidationStrategy>
         implements ClassMappingFactory<ValidationStrategy, MessageResolver>
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, String> strategyMessageResolverMapping;
     private List<NameMapper<ValidationStrategy>> nameMapperList = new ArrayList<NameMapper<ValidationStrategy>>();
 
     public DefaultMessageResolverFactory()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public MessageResolver create(ValidationStrategy validationStrategy)
@@ -98,10 +94,7 @@ public class DefaultMessageResolverFacto
             {
                 addMapping(strategyName, resolverName);
 
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace(resolverName + " used for " + strategyName);
-                }
+                logger.finest(resolverName + " used for " + strategyName);
 
                 return messageResolver;
             }
@@ -135,11 +128,8 @@ public class DefaultMessageResolverFacto
     @ToDo(value = Priority.MEDIUM, description = "logging")
     private synchronized void addMapping(String validationStrategyName, String messageResolverName)
     {
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("adding static validation strategy to message resolver mapping: "
-                + validationStrategyName + " -> " + messageResolverName);
-        }
+        logger.finest("adding static validation strategy to message resolver mapping: "
+            + validationStrategyName + " -> " + messageResolverName);
 
         strategyMessageResolverMapping.put(validationStrategyName, messageResolverName);
     }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/AbstractValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/AbstractValidationStrategyToMsgResolverNameMapper.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/AbstractValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/AbstractValidationStrategyToMsgResolverNameMapper.java Sat Apr  3 00:33:05 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
@@ -32,13 +32,10 @@ import org.apache.commons.logging.LogFac
 @UsageInformation(UsageCategory.INTERNAL)
 public abstract class AbstractValidationStrategyToMsgResolverNameMapper implements NameMapper<ValidationStrategy>
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     public AbstractValidationStrategyToMsgResolverNameMapper()
     {
-        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_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java Sat Apr  3 00:33:05 2010
@@ -22,13 +22,13 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
 import org.apache.myfaces.extensions.validator.internal.ToDo;
 import org.apache.myfaces.extensions.validator.internal.Priority;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.Map;
 import java.util.List;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -45,7 +45,7 @@ import java.lang.reflect.Modifier;
 @UsageInformation(UsageCategory.INTERNAL)
 public class DefaultValidationParameterExtractor implements ValidationParameterExtractor
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     public Map<Object, List<Object>> extract(Annotation annotation)
     {
@@ -134,12 +134,9 @@ public class DefaultValidationParameterE
                     processParameterValue(annotation, (Class)parameterValue, result, valueId);
                 }
             }
-            catch (Throwable e)
+            catch (Exception e)
             {
-                if(this.logger.isWarnEnabled())
-                {
-                    this.logger.warn(e);
-                }
+                this.logger.log(Level.WARNING, "invalid method", e);
             }
         }
 
@@ -278,12 +275,9 @@ public class DefaultValidationParameterE
             {
                 newKey = currentField.get(instance);
             }
-            catch (Throwable e)
+            catch (Exception e)
             {
-                if(this.logger.isWarnEnabled())
-                {
-                    this.logger.warn(e);
-                }
+                this.logger.log(Level.WARNING, "invalid field", e);
             }
         }
         //no "else if" to allow both at one field
@@ -296,12 +290,9 @@ public class DefaultValidationParameterE
                 {
                     paramValues.add(currentField.get(instance));
                 }
-                catch (Throwable e)
+                catch (Exception e)
                 {
-                    if(this.logger.isWarnEnabled())
-                    {
-                        this.logger.warn(e);
-                    }
+                    this.logger.log(Level.WARNING, "invalid field", e);
                 }
             }
         }
@@ -322,12 +313,9 @@ public class DefaultValidationParameterE
                     newKey = currentMethod.invoke(paramClass.newInstance());
                 }
             }
-            catch (Throwable e)
+            catch (Exception e)
             {
-                if(this.logger.isWarnEnabled())
-                {
-                    this.logger.warn(e);
-                }
+                this.logger.log(Level.WARNING, "invalid method", e);
             }
         }
         //no "else if" to allow both at one field
@@ -340,16 +328,16 @@ public class DefaultValidationParameterE
                 {
                     parameterValues.add(currentMethod.invoke(paramClass.newInstance()));
                 }
-                catch (Throwable e)
+                catch (Exception e)
                 {
                     //check if it's a none-static inner class -> return this class
                     if(paramClass.getEnclosingClass() != null)
                     {
                         parameterValues.add(paramClass);
                     }
-                    else if(this.logger.isWarnEnabled())
+                    else
                     {
-                        this.logger.warn(e);
+                        this.logger.log(Level.WARNING, "invalid method", e);
                     }
                 }
             }
@@ -397,4 +385,4 @@ public class DefaultValidationParameterE
 
         return false;
     }
-}
\ No newline at end of file
+}

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractorFactory.java Sat Apr  3 00:33:05 2010
@@ -24,11 +24,10 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.core.CustomInformation;
 import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * @author Gerhard Petracek
@@ -37,16 +36,13 @@ import java.util.List;
 @UsageInformation(UsageCategory.INTERNAL)
 public class DefaultValidationParameterExtractorFactory implements ValidationParameterExtractorFactory
 {
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = Logger.getLogger(getClass().getName());
 
     private static ValidationParameterExtractor validationParameterExtractor = null;
 
     public DefaultValidationParameterExtractorFactory()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public ValidationParameterExtractor create()
@@ -73,11 +69,8 @@ public class DefaultValidationParameterE
             }
         }
 
-        if(logger.isTraceEnabled())
-        {
-            logger.trace(validationParameterExtractor.getClass().getName() + " created");
-        }
+        logger.finest(validationParameterExtractor.getClass().getName() + " created");
 
         return validationParameterExtractor;
     }
-}
\ No newline at end of file
+}

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java Sat Apr  3 00:33:05 2010
@@ -32,6 +32,7 @@ import javax.faces.validator.ValidatorEx
 import java.lang.annotation.Annotation;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.logging.Level;
 
 /**
  * Provides the ability of message resolving to ValidationStrategies
@@ -68,11 +69,8 @@ public abstract class AbstractAnnotation
         }
         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_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java Sat Apr  3 00:33:05 2010
@@ -23,12 +23,11 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 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 javax.faces.validator.ValidatorException;
+import java.util.logging.Logger;
 
 /**
  * Provides the ability to use ValidatorException (as expected by the user) instead of ConverterException.
@@ -42,51 +41,33 @@ import javax.faces.validator.ValidatorEx
 @UsageInformation({UsageCategory.INTERNAL, UsageCategory.REUSE})
 public abstract class AbstractValidationStrategy implements ValidationStrategy
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     protected AbstractValidationStrategy()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public void validate(FacesContext facesContext, UIComponent uiComponent,
                          MetaDataEntry metaDataEntry, Object convertedObject)
     {
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("start initValidation of " + getClass().getName());
-        }
+        logger.finest("start initValidation of " + getClass().getName());
 
         initValidation(facesContext, uiComponent, metaDataEntry, convertedObject);
 
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("initValidation of " + getClass().getName() + " finished");
-        }
+        logger.finest("initValidation of " + getClass().getName() + " finished");
 
         try
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("start processValidation of " + getClass().getName());
-            }
+            logger.finest("start processValidation of " + getClass().getName());
 
             processValidation(facesContext, uiComponent, metaDataEntry, convertedObject);
 
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("processValidation of " + getClass().getName() + " finished");
-            }
+            logger.finest("processValidation of " + getClass().getName() + " finished");
         }
         catch (ValidatorException e)
         {
-            if(logger.isTraceEnabled())
-            {
-                logger.trace("start processAfterValidatorException of " + getClass().getName());
-            }
+            logger.finest("start processAfterValidatorException of " + getClass().getName());
 
             ValidatorException validatorException;
 
@@ -104,21 +85,15 @@ public abstract class AbstractValidation
             if (processAfterValidatorException(
                     facesContext, uiComponent, metaDataEntry, convertedObject, validatorException))
             {
-                if(logger.isTraceEnabled())
-                {
-                    logger.trace(getClass().getName() +
-                        ": throw original exception after processAfterValidatorException");
-                }
+                logger.finest(getClass().getName() +
+                    ": throw original exception after processAfterValidatorException");
 
                 ExtValUtils.tryToThrowValidatorExceptionForComponent(
                         uiComponent, validatorException.getFacesMessage(), validatorException);
             }
 
-            if(logger.isTraceEnabled())
-            {
-                logger.trace(getClass().getName() +
-                    ": original exception after processAfterValidatorException not thrown");
-            }
+            logger.finest(getClass().getName() +
+                ": original exception after processAfterValidatorException not thrown");
         }
     }
 

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java Sat Apr  3 00:33:05 2010
@@ -23,11 +23,10 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.metadata.transformer.BeanMetaDataTransformerAdapter;
 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.component.UIComponent;
 import javax.faces.context.FacesContext;
+import java.util.logging.Logger;
 
 /**
  * it isn't linked to jsr 303
@@ -44,7 +43,7 @@ import javax.faces.context.FacesContext;
 @UsageInformation({UsageCategory.REUSE})
 public class BeanValidationStrategyAdapterImpl implements BeanValidationStrategyAdapter
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private MetaDataTransformer metaDataTransformer;
     private ValidationStrategy validationStrategy;
@@ -53,10 +52,7 @@ public class BeanValidationStrategyAdapt
 
     public BeanValidationStrategyAdapterImpl()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public void validate(FacesContext facesContext,

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Sat Apr  3 00:33:05 2010
@@ -36,14 +36,13 @@ 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.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.logging.Logger;
 
 
 /**
@@ -56,17 +55,14 @@ import java.util.MissingResourceExceptio
 public class DefaultValidationStrategyFactory extends AbstractNameMapperAwareFactory<String>
         implements ClassMappingFactory<String, ValidationStrategy>
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     private Map<String, String> metaDataKeyToValidationStrategyMapping = null;
     private List<NameMapper<String>> nameMapperList = new ArrayList<NameMapper<String>>();
 
     public DefaultValidationStrategyFactory()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 
     public ValidationStrategy create(String metaDataKey)
@@ -120,11 +116,8 @@ public class DefaultValidationStrategyFa
 
     private synchronized void addMapping(String metaDataKey, String validationStrategyName)
     {
-        if(logger.isTraceEnabled())
-        {
-            logger.trace("adding meta-data key to validation strategy mapping: "
-                + metaDataKey + " -> " + validationStrategyName);
-        }
+        logger.finest("adding meta-data key to validation strategy mapping: "
+            + metaDataKey + " -> " + validationStrategyName);
 
         metaDataKeyToValidationStrategyMapping.put(metaDataKey, validationStrategyName);
     }
@@ -152,7 +145,7 @@ public class DefaultValidationStrategyFa
 
             setupStrategyMappings(staticConfig.getMapping());
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/AbstractMetaDataToValidationStrategyNameMapper.java Sat Apr  3 00:33:05 2010
@@ -21,8 +21,8 @@ package org.apache.myfaces.extensions.va
 import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
 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
@@ -31,13 +31,10 @@ import org.apache.commons.logging.LogFac
 @UsageInformation(UsageCategory.INTERNAL)
 public abstract class AbstractMetaDataToValidationStrategyNameMapper implements NameMapper<String>
 {
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = Logger.getLogger(getClass().getName());
 
     public AbstractMetaDataToValidationStrategyNameMapper()
     {
-        if(logger.isDebugEnabled())
-        {
-            logger.debug(getClass().getName() + " instantiated");
-        }
+        logger.fine(getClass().getName() + " instantiated");
     }
 }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java?rev=930447&r1=930446&r2=930447&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/util/ClassUtils.java Sat Apr  3 00:33:05 2010
@@ -20,11 +20,11 @@ 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.jar.Manifest;
 import java.util.jar.Attributes;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 import java.net.URL;
 
 /**
@@ -34,7 +34,7 @@ import java.net.URL;
 @UsageInformation(UsageCategory.INTERNAL)
 public class ClassUtils
 {
-    private static final Log LOG = LogFactory.getLog(ClassUtils.class);
+    private static final Logger LOG = Logger.getLogger(ClassUtils.class.getName());
 
     public static Class tryToLoadClassForName(String name)
     {
@@ -71,7 +71,7 @@ public class ClassUtils
         {
             return targetClass.newInstance();
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -84,7 +84,7 @@ public class ClassUtils
         {
             return instantiateClassForName(className);
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -111,12 +111,9 @@ public class ClassUtils
             return new Manifest(new URL(manifestFileLocation).openStream())
                     .getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
         }
-        catch (Throwable t)
+        catch (Exception e)
         {
-            if (LOG.isTraceEnabled())
-            {
-                LOG.trace("couldn't load version of jar file which contains " + targetClass.getName(), t);
-            }
+            LOG.log(Level.FINEST, "couldn't load version of jar file which contains " + targetClass.getName(), e);
             return null;
         }
     }



Mime
View raw message