You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/10/13 19:42:40 UTC
svn commit: r824859 [4/4] - in /myfaces: core/trunk/api/
core/trunk/api/src/main/java/javax/faces/component/
core/trunk/api/src/main/java/javax/faces/validator/
core/trunk/api/src/main/java/javax/faces/webapp/ core/trunk/impl/
core/trunk/impl/src/main/...
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Tue Oct 13 17:42:36 2009
@@ -18,13 +18,14 @@
*/
package org.apache.myfaces.shared.config;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.util.ClassUtils;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
+import org.apache.myfaces.shared.util.ClassUtils;
+
/**
* Holds all configuration init parameters (from web.xml) that are independent
* from the core implementation. The parameters in this class are available to
@@ -43,7 +44,8 @@
*/
public class MyfacesConfig
{
- private static final Log log = LogFactory.getLog(MyfacesConfig.class);
+ //private static final Log log = LogFactory.getLog(MyfacesConfig.class);
+ private static final Logger log = Logger.getLogger(MyfacesConfig.class.getName());
private static final String APPLICATION_MAP_PARAM_NAME = MyfacesConfig.class.getName();
@@ -220,7 +222,7 @@
}
else
{
- if (log.isInfoEnabled())
+ if (log.isLoggable(Level.INFO))
{
log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
}
@@ -228,7 +230,7 @@
if(RI_IMPL_AVAILABLE)
{
- if(log.isInfoEnabled())
+ if(log.isLoggable(Level.INFO))
{
log.info("Starting up Tomahawk on the RI-JSF-Implementation.");
}
@@ -236,7 +238,7 @@
if(MYFACES_IMPL_AVAILABLE)
{
- if(log.isInfoEnabled())
+ if(log.isLoggable(Level.INFO))
{
log.info("Starting up Tomahawk on the MyFaces-JSF-Implementation");
}
@@ -244,7 +246,7 @@
if(RI_IMPL_AVAILABLE && MYFACES_IMPL_AVAILABLE)
{
- log.error("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
+ log.severe("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
}
return myfacesConfig;
}
@@ -256,7 +258,7 @@
String strValue = externalContext.getInitParameter(paramName);
if (strValue == null)
{
- if (log.isInfoEnabled()) log.info("No context init parameter '" + paramName + "' found, using default value " + defaultValue);
+ if (log.isLoggable(Level.INFO)) log.info("No context init parameter '" + paramName + "' found, using default value " + defaultValue);
return defaultValue;
}
else if (strValue.equalsIgnoreCase("true") || strValue.equalsIgnoreCase("on") || strValue.equalsIgnoreCase("yes"))
@@ -269,7 +271,7 @@
}
else
{
- if (log.isWarnEnabled()) log.warn("Wrong context init parameter '" + paramName + "' (='" + strValue + "'), using default value " + defaultValue);
+ if (log.isLoggable(Level.WARNING)) log.warning("Wrong context init parameter '" + paramName + "' (='" + strValue + "'), using default value " + defaultValue);
return defaultValue;
}
}
@@ -281,7 +283,7 @@
String strValue = externalContext.getInitParameter(paramName);
if (strValue == null)
{
- if (log.isInfoEnabled()) log.info("No context init parameter '" + paramName + "' found, using default value " + defaultValue); //defaultValue==null should not be a problem here
+ if (log.isLoggable(Level.INFO)) log.info("No context init parameter '" + paramName + "' found, using default value " + defaultValue); //defaultValue==null should not be a problem here
return defaultValue;
}
@@ -294,7 +296,7 @@
String strValue = externalContext.getInitParameter(paramName);
if (strValue == null)
{
- if (log.isInfoEnabled()) log.info("No context init parameter '" +paramName +"' found, using default value " +defaultValue);
+ if (log.isLoggable(Level.INFO)) log.info("No context init parameter '" +paramName +"' found, using default value " +defaultValue);
return defaultValue;
}
else
@@ -302,7 +304,7 @@
try {
return Long.parseLong(strValue);
} catch (NumberFormatException e) {
- if (log.isWarnEnabled()) log.warn("Wrong context init parameter '" + paramName + "' (='" + strValue + "'), using default value " + defaultValue);
+ if (log.isLoggable(Level.WARNING)) log.warning("Wrong context init parameter '" + paramName + "' (='" + strValue + "'), using default value " + defaultValue);
}
return defaultValue;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Tue Oct 13 17:42:36 2009
@@ -32,6 +32,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.el.ValueExpression;
import javax.faces.FacesException;
@@ -59,8 +61,6 @@
import javax.faces.render.RenderKitFactory;
import javax.faces.render.ResponseStateManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
import org.apache.myfaces.shared.util.HashMapUtils;
import org.apache.myfaces.shared.util.SelectItemsIterator;
@@ -75,7 +75,8 @@
//nope
}
- private static final Log log = LogFactory.getLog(RendererUtils.class);
+ //private static final Log log = LogFactory.getLog(RendererUtils.class);
+ private static final Logger log = Logger.getLogger(RendererUtils.class.getName());
public static final String SELECT_ITEM_LIST_ATTR = RendererUtils.class.getName() + ".LIST";
public static final String EMPTY_STRING = "";
@@ -266,7 +267,7 @@
{
if (submittedValue instanceof String)
{
- if (log.isDebugEnabled()) log.debug("returning 1 '" + submittedValue + "'");
+ if (log.isLoggable(Level.FINE)) log.fine("returning 1 '" + submittedValue + "'");
return (String)submittedValue;
}
@@ -298,11 +299,11 @@
try
{
converter = facesContext.getApplication().createConverter(value.getClass());
- if (log.isDebugEnabled()) log.debug("the created converter is " + converter);
+ if (log.isLoggable(Level.FINE)) log.fine("the created converter is " + converter);
}
catch (FacesException e)
{
- log.error("No converter for class " + value.getClass().getName() + " found (component id=" + component.getId() + ").");
+ log.log(Level.SEVERE, "No converter for class " + value.getClass().getName() + " found (component id=" + component.getId() + ").", e);
// converter stays null
}
}
@@ -311,22 +312,22 @@
{
if (value == null)
{
- if (log.isDebugEnabled()) log.debug("returning an empty string");
+ if (log.isLoggable(Level.FINE)) log.fine("returning an empty string");
return "";
}
- if (log.isDebugEnabled()) log.debug("returning an .toString");
+ if (log.isLoggable(Level.FINE)) log.fine("returning an .toString");
return value.toString();
}
- if (log.isDebugEnabled()) log.debug("returning converter get as string " + converter);
+ if (log.isLoggable(Level.FINE)) log.fine("returning converter get as string " + converter);
return converter.getAsString(facesContext, component, value);
}
catch(PropertyNotFoundException ex)
{
- log.error("Property not found - called by component : "+getPathToComponent(component),ex);
+ log.log(Level.SEVERE, "Property not found - called by component : "+getPathToComponent(component),ex);
throw ex;
}
@@ -453,7 +454,7 @@
}
catch (FacesException e)
{
- log.error("No Converter for type " + listComponentType.getName() + " found", e);
+ log.log(Level.SEVERE, "No Converter for type " + listComponentType.getName() + " found", e);
return null;
}
@@ -477,7 +478,7 @@
}
catch (FacesException e)
{
- log.error("No Converter for type " + arrayComponentType.getName() + " found", e);
+ log.log(Level.SEVERE, "No Converter for type " + arrayComponentType.getName() + " found", e);
return null;
}
}
@@ -856,7 +857,7 @@
return Boolean.valueOf((String) value).booleanValue();
}
else if (value != null) {
- log.error("value for attribute " + attribute +
+ log.severe("value for attribute " + attribute +
" must be instanceof 'Boolean' or 'String', is of type : " + value.getClass());
return defaultValue;
@@ -973,7 +974,7 @@
UIComponent forComponent = uiComponent.findComponent(forAttr);
if (forComponent == null)
{
- if (log.isInfoEnabled())
+ if (log.isLoggable(Level.INFO))
{
log
.info("Unable to find component '"
@@ -1074,13 +1075,13 @@
}
}
catch (FileNotFoundException e) {
- if (log.isWarnEnabled())
- log.warn("no such file " + file, e);
+ if (log.isLoggable(Level.WARNING))
+ log.log(Level.WARNING, "no such file " + file, e);
content = null;
}
catch (IOException e) {
- if (log.isWarnEnabled())
- log.warn("problems during processing resource " + file, e);
+ if (log.isLoggable(Level.WARNING))
+ log.log(Level.WARNING, "problems during processing resource " + file, e);
content = null;
}
finally
@@ -1091,7 +1092,7 @@
}
catch (IOException e)
{
- log.warn(e.getLocalizedMessage(), e);
+ log.log(Level.WARNING, e.getLocalizedMessage(), e);
}
if (in != null)
{
@@ -1101,7 +1102,7 @@
}
catch (IOException e)
{
- log.warn(e.getLocalizedMessage(), e);
+ log.log(Level.WARNING, e.getLocalizedMessage(), e);
}
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java Tue Oct 13 17:42:36 2009
@@ -28,6 +28,9 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.el.ValueExpression;
import javax.faces.FacesException;
@@ -37,9 +40,6 @@
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* The util methods in this class are shared between the javax.faces.component package and
* the org.apache.myfaces.renderkit package.
@@ -317,14 +317,14 @@
return targetForConvertedValues;
}
- private static final Log log = LogFactory
- .getLog(_SharedRendererUtils.class);
+ //private static final Log log = LogFactory.getLog(_SharedRendererUtils.class);
+ private static final Logger log = Logger.getLogger(_SharedRendererUtils.class.getName());
/**
* This method is different in the two versions of _SharedRendererUtils.
*/
private static void log(FacesContext context, String msg, Exception e)
{
- log.error(msg, e);
+ log.log(Level.SEVERE, msg, e);
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Tue Oct 13 17:42:36 2009
@@ -18,10 +18,13 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.component.NamingContainer;
@@ -38,11 +41,9 @@
import javax.faces.convert.ConverterException;
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
* @author Thomas Spiegl (latest modification by $Author$)
@@ -50,8 +51,9 @@
* @version $Revision$ $Date$
*/
public class HtmlCheckboxRendererBase extends HtmlRenderer {
- private static final Log log = LogFactory
- .getLog(HtmlCheckboxRendererBase.class);
+ //private static final Log log = LogFactory
+ // .getLog(HtmlCheckboxRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlCheckboxRendererBase.class.getName());
private static final String PAGE_DIRECTION = "pageDirection";
@@ -85,7 +87,7 @@
} else if (layout.equals(LINE_DIRECTION)) {
pageDirectionLayout = false;
} else {
- log.error("Wrong layout attribute for component "
+ log.severe("Wrong layout attribute for component "
+ selectMany.getClientId(facesContext) + ": " + layout);
}
}
@@ -106,8 +108,8 @@
converter = org.apache.myfaces.shared.renderkit.RendererUtils.findUISelectManyConverter(facesContext,
selectMany);
} catch (FacesException e) {
- log.error("Error finding Converter for component with id "
- + selectMany.getClientId(facesContext));
+ log.log(Level.SEVERE, "Error finding Converter for component with id "
+ + selectMany.getClientId(facesContext), e);
converter = null;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Tue Oct 13 17:42:36 2009
@@ -22,6 +22,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
@@ -31,8 +33,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
@@ -49,7 +49,8 @@
public class HtmlGridRendererBase
extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlGridRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlGridRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlGridRendererBase.class.getName());
private static final Integer[] ZERO_INT_ARRAY = new Integer[]{0};
@@ -88,9 +89,9 @@
if (columns <= 0)
{
- if (log.isErrorEnabled())
+ if (log.isLoggable(Level.SEVERE))
{
- log.error("Wrong columns attribute for PanelGrid " + component.getClientId(facesContext) + ": " + columns);
+ log.severe("Wrong columns attribute for PanelGrid " + component.getClientId(facesContext) + ": " + columns);
}
columns = 1;
}
@@ -306,7 +307,7 @@
{
if (columnIndex > 0)
{
- if (log.isWarnEnabled()) log.warn("PanelGrid " + component.getClientId(context) + " has not enough children. Child count should be a multiple of the columns attribute.");
+ if (log.isLoggable(Level.WARNING)) log.warning("PanelGrid " + component.getClientId(context) + " has not enough children. Child count should be a multiple of the columns attribute.");
//Render empty columns, so that table is correct
for ( ; columnIndex < columns; columnIndex++)
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Tue Oct 13 17:42:36 2009
@@ -18,10 +18,11 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.application.Resource;
import javax.faces.component.UIComponent;
@@ -31,9 +32,9 @@
import javax.faces.component.html.HtmlGraphicImage;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
@@ -45,7 +46,8 @@
public class HtmlImageRendererBase
extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlImageRendererBase.class.getName());
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
throws IOException
@@ -102,7 +104,7 @@
else
{
- if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url or name).");
+ if (log.isLoggable(Level.WARNING)) log.warning("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url or name).");
}
}
@@ -111,7 +113,7 @@
*/
if (uiComponent.getAttributes().get(HTML.ALT_ATTR) == null)
{
- log.warn("ALT attribute is missing for : " + uiComponent.getId());
+ log.warning("ALT attribute is missing for : " + uiComponent.getId());
}
Map<String, List<ClientBehavior>> behaviors = null;
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Tue Oct 13 17:42:36 2009
@@ -22,6 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -33,8 +34,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
@@ -46,7 +45,8 @@
public abstract class HtmlMessageRendererBase
extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlMessageRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlMessageRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlMessageRendererBase.class.getName());
protected abstract String getSummary(FacesContext facesContext,
UIComponent message,
@@ -76,14 +76,14 @@
String forAttr = getFor(message);
if (forAttr == null)
{
- log.error("Attribute 'for' of UIMessage must not be null");
+ log.severe("Attribute 'for' of UIMessage must not be null");
return;
}
UIComponent forComponent = message.findComponent(forAttr);
if (forComponent == null)
{
- log.error("Could not render Message. Unable to find component '" + forAttr + "' (calling findComponent on component '" + message.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
+ log.severe("Could not render Message. Unable to find component '" + forAttr + "' (calling findComponent on component '" + message.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
return;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java Tue Oct 13 17:42:36 2009
@@ -22,6 +22,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -30,8 +32,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.util.NullIterator;
@@ -43,7 +43,8 @@
public abstract class HtmlMessagesRendererBase
extends HtmlMessageRendererBase
{
- private static final Log log = LogFactory.getLog(HtmlMessagesRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlMessagesRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlMessagesRendererBase.class.getName());
protected static final String LAYOUT_LIST = "list";
protected static final String LAYOUT_TABLE = "table";
@@ -61,7 +62,7 @@
forComponent = messages.findComponent(forAttr);
if (forComponent == null)
{
- log.error("Could not render Messages. Unable to find component '" + forAttr + "' (calling findComponent on component '" + messages.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
+ log.severe("Could not render Messages. Unable to find component '" + forAttr + "' (calling findComponent on component '" + messages.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
return;
}
}
@@ -74,9 +75,9 @@
String layout = getLayout(messages);
if (layout == null)
{
- if (log.isDebugEnabled())
+ if (log.isLoggable(Level.FINE))
{
- log.debug("No messages layout given, using default layout 'list'.");
+ log.fine("No messages layout given, using default layout 'list'.");
}
renderList(facesContext, messages, messagesIterator);
}
@@ -86,9 +87,9 @@
}
else
{
- if (log.isWarnEnabled() && !layout.equalsIgnoreCase(LAYOUT_LIST))
+ if (log.isLoggable(Level.WARNING) && !layout.equalsIgnoreCase(LAYOUT_LIST))
{
- log.warn("Unsupported messages layout '" + layout + "' - using default layout 'list'.");
+ log.warning("Unsupported messages layout '" + layout + "' - using default layout 'list'.");
}
renderList(facesContext, messages, messagesIterator);
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Tue Oct 13 17:42:36 2009
@@ -18,13 +18,16 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
-import javax.faces.component.*;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.component.UISelectOne;
import javax.faces.component.behavior.ClientBehavior;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlSelectOneRadio;
@@ -34,10 +37,10 @@
import javax.faces.convert.ConverterException;
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -47,7 +50,8 @@
public class HtmlRadioRendererBase
extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlRadioRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlRadioRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlRadioRendererBase.class.getName());
private static final String PAGE_DIRECTION = "pageDirection";
private static final String LINE_DIRECTION = "lineDirection";
@@ -73,7 +77,7 @@
}
else
{
- log.error("Wrong layout attribute for component " + selectOne.getClientId(facesContext) + ": " + layout);
+ log.severe("Wrong layout attribute for component " + selectOne.getClientId(facesContext) + ": " + layout);
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Tue Oct 13 17:42:36 2009
@@ -28,6 +28,8 @@
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.application.ConfigurableNavigationHandler;
@@ -57,8 +59,6 @@
import javax.faces.model.SelectItem;
import javax.faces.model.SelectItemGroup;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
import org.apache.myfaces.shared.component.EscapeCapable;
import org.apache.myfaces.shared.config.MyfacesConfig;
@@ -75,7 +75,8 @@
* @version $Revision$ $Date$
*/
public final class HtmlRendererUtils {
- private static final Log log = LogFactory.getLog(HtmlRendererUtils.class);
+ //private static final Log log = LogFactory.getLog(HtmlRendererUtils.class);
+ private static final Logger log = Logger.getLogger(HtmlRendererUtils.class.getName());
//private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final String LINE_SEPARATOR = System.getProperty(
@@ -140,7 +141,7 @@
.get(clientId));
}
else {
- log.warn(NON_SUBMITTED_VALUE_WARNING +
+ log.warning(NON_SUBMITTED_VALUE_WARNING +
" Component : " +
RendererUtils.getPathToComponent(component));
}
@@ -478,7 +479,7 @@
converter = RendererUtils.findUISelectManyConverter(
facesContext, (UISelectMany) uiComponent);
} catch (FacesException e) {
- log.error("Error finding Converter for component with id "
+ log.log(Level.SEVERE, "Error finding Converter for component with id "
+ uiComponent.getClientId(facesContext), e);
converter = null;
}
@@ -491,7 +492,7 @@
converter = RendererUtils.findUIOutputConverter(facesContext,
(UIOutput) uiComponent);
} catch (FacesException e) {
- log.error("Error finding Converter for component with id "
+ log.log(Level.SEVERE, "Error finding Converter for component with id "
+ uiComponent.getClientId(facesContext), e);
converter = null;
}
@@ -841,7 +842,7 @@
public static void renderDisplayValueOnlyAttributes(UIComponent uiComponent, ResponseWriter writer) throws IOException {
if(!(uiComponent instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable))
{
- log.error("Wrong type of uiComponent. needs DisplayValueOnlyCapable.");
+ log.severe("Wrong type of uiComponent. needs DisplayValueOnlyCapable.");
renderHTMLAttributes(writer, uiComponent,
HTML.COMMON_PASSTROUGH_ATTRIBUTES);
@@ -1383,7 +1384,7 @@
int comma = scrolling.indexOf(',');
if (comma == -1)
{
- log.warn("Illegal autoscroll request parameter: " + scrolling);
+ log.warning("Illegal autoscroll request parameter: " + scrolling);
}
else
{
@@ -1391,7 +1392,7 @@
//we convert to int against XSS vulnerability
x = Integer.parseInt(scrolling.substring(0, comma));
} catch (NumberFormatException e) {
- log.warn("Error getting x offset for autoscroll feature. Bad param value: " + scrolling);
+ log.warning("Error getting x offset for autoscroll feature. Bad param value: " + scrolling);
x = 0; //ignore false numbers
}
@@ -1399,7 +1400,7 @@
//we convert to int against XSS vulnerability
y = Integer.parseInt(scrolling.substring(comma + 1));
} catch (NumberFormatException e) {
- log.warn("Error getting y offset for autoscroll feature. Bad param value: " + scrolling);
+ log.warning("Error getting y offset for autoscroll feature. Bad param value: " + scrolling);
y = 0; //ignore false numbers
}
}
@@ -1856,8 +1857,8 @@
if(contentTypeListString == null)
{
- if (log.isDebugEnabled())
- log.debug("No content type list given, creating HtmlResponseWriterImpl with default content type.");
+ if (log.isLoggable(Level.FINE))
+ log.fine("No content type list given, creating HtmlResponseWriterImpl with default content type.");
contentTypeListString = HTML_CONTENT_TYPE;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Tue Oct 13 17:42:36 2009
@@ -18,20 +18,21 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder;
-
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.HashSet;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -41,7 +42,8 @@
public class HtmlResponseWriterImpl
extends ResponseWriter
{
- private static final Log log = LogFactory.getLog(HtmlResponseWriterImpl.class);
+ //private static final Log log = LogFactory.getLog(HtmlResponseWriterImpl.class);
+ private static final Logger log = Logger.getLogger(HtmlResponseWriterImpl.class.getName());
private static final String DEFAULT_CONTENT_TYPE = "text/html";
private static final String DEFAULT_CHARACTER_ENCODING = "ISO-8859-1";
@@ -93,12 +95,12 @@
_contentType = contentType;
if (_contentType == null)
{
- if (log.isDebugEnabled()) log.debug("No content type given, using default content type " + DEFAULT_CONTENT_TYPE);
+ if (log.isLoggable(Level.FINE)) log.fine("No content type given, using default content type " + DEFAULT_CONTENT_TYPE);
_contentType = DEFAULT_CONTENT_TYPE;
}
if (characterEncoding == null)
{
- if (log.isDebugEnabled()) log.debug("No character encoding given, using default character encoding " + DEFAULT_CHARACTER_ENCODING);
+ if (log.isLoggable(Level.FINE)) log.fine("No character encoding given, using default character encoding " + DEFAULT_CHARACTER_ENCODING);
_characterEncoding = DEFAULT_CHARACTER_ENCODING;
}
else
@@ -228,13 +230,13 @@
throw new NullPointerException("elementName name must not be null");
}
- if (log.isWarnEnabled())
+ if (log.isLoggable(Level.WARNING))
{
if (_startElementName != null &&
!name.equals(_startElementName))
{
- if (log.isWarnEnabled())
- log.warn("HTML nesting warning on closing " + name + ": element " + _startElementName +
+ if (log.isLoggable(Level.WARNING))
+ log.warning("HTML nesting warning on closing " + name + ": element " + _startElementName +
(_startElementUIComponent==null?"":(" rendered by component : "+
RendererUtils.getPathToComponent(_startElementUIComponent)))+" not explicitly closed");
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Tue Oct 13 17:42:36 2009
@@ -22,6 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
@@ -33,8 +34,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
@@ -59,7 +58,8 @@
protected static final String CAPTION_FACET_NAME = "caption";
/** The logger. */
- private static final Log log = LogFactory.getLog(HtmlTableRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlTableRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlTableRendererBase.class.getName());
private static final Integer[] ZERO_INT_ARRAY = new Integer[]{0};
@@ -332,7 +332,7 @@
// bail if any row does not exist
uiData.setRowIndex(currentRow);
if(!uiData.isRowAvailable()) {
- log.error("Row is not available. Rowindex = " + currentRow);
+ log.severe("Row is not available. Rowindex = " + currentRow);
break;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Tue Oct 13 17:42:36 2009
@@ -18,29 +18,28 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.component.EscapeCapable;
-import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UIOutput;
import javax.faces.component.UIViewRoot;
import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorContext;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlInputText;
import javax.faces.component.html.HtmlOutputText;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.ConverterException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.myfaces.shared.component.EscapeCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
* @author Thomas Spiegl (latest modification by $Author$)
@@ -50,7 +49,8 @@
public class HtmlTextRendererBase
extends HtmlRenderer
{
- private static final Log log = LogFactory.getLog(HtmlTextRendererBase.class);
+ //private static final Log log = LogFactory.getLog(HtmlTextRendererBase.class);
+ private static final Logger log = Logger.getLogger(HtmlTextRendererBase.class.getName());
private static final String AUTOCOMPLETE_VALUE_OFF = "off";
@@ -79,7 +79,7 @@
{
String text = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isDebugEnabled()) log.debug("renderOutput '" + text + "'");
+ if (log.isLoggable(Level.FINE)) log.fine("renderOutput '" + text + "'");
boolean escape;
if (component instanceof HtmlOutputText || component instanceof EscapeCapable)
{
@@ -124,7 +124,7 @@
if (escape)
{
- if (log.isDebugEnabled()) log.debug("renderOutputText writing '" + text + "'");
+ if (log.isLoggable(Level.FINE)) log.fine("renderOutputText writing '" + text + "'");
writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
@@ -147,7 +147,7 @@
String clientId = component.getClientId(facesContext);
String value = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isDebugEnabled()) log.debug("renderInput '" + value + "'");
+ if (log.isLoggable(Level.FINE)) log.fine("renderInput '" + value + "'");
writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Tue Oct 13 17:42:36 2009
@@ -18,16 +18,16 @@
*/
package org.apache.myfaces.shared.renderkit.html.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.config.MyfacesConfig;
-
-import javax.faces.context.ExternalContext;
-import javax.servlet.http.HttpSession;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+import java.util.logging.Logger;
+
+import javax.faces.context.ExternalContext;
+import javax.servlet.http.HttpSession;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -36,7 +36,8 @@
*/
public final class JavascriptUtils
{
- private static final Log log = LogFactory.getLog(JavascriptUtils.class);
+ //private static final Log log = LogFactory.getLog(JavascriptUtils.class);
+ private static final Logger log = Logger.getLogger(JavascriptUtils.class.getName());
public static final String JAVASCRIPT_DETECTED = JavascriptUtils.class.getName() + ".JAVASCRIPT_DETECTED";
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyELTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyELTagBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyELTagBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyELTagBase.java Tue Oct 13 17:42:36 2009
@@ -18,8 +18,10 @@
*/
package org.apache.myfaces.shared.taglib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
@@ -27,8 +29,6 @@
import javax.faces.webapp.UIComponentELTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
-import java.io.IOException;
-import java.io.Reader;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -36,18 +36,19 @@
*/
public abstract class UIComponentBodyELTagBase extends UIComponentELTag
{
- private static final Log log = LogFactory.getLog(UIComponentBodyTagBase.class);
+ //private static final Log log = LogFactory.getLog(UIComponentBodyTagBase.class);
+ private static final Logger log = Logger.getLogger(UIComponentBodyTagBase.class.getName());
public int doEndTag() throws JspException
{
- if (log.isWarnEnabled())
+ if (log.isLoggable(Level.WARNING))
{
UIComponent component = getComponentInstance();
if (component != null &&
component.getRendersChildren() &&
!isBodyContentEmpty())
{
- log.warn("Component with id '" + component.getClientId(getFacesContext()) +
+ log.warning("Component with id '" + component.getClientId(getFacesContext()) +
"' (" + getClass().getName() +
" tag) and path : "+org.apache.myfaces.shared.renderkit.RendererUtils.getPathToComponent(component)+"renders it's children, but has embedded JSP or HTML code. Use the <f:verbatim> tag for nested HTML. For comments use <%/* */%> style JSP comments instead of <!-- --> style HTML comments." +
"\n BodyContent:\n" + getBodyContent().getString().trim());
@@ -81,7 +82,7 @@
}
catch (IOException e)
{
- log.error("Error inspecting BodyContent", e);
+ log.log(Level.SEVERE, "Error inspecting BodyContent", e);
return false;
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java Tue Oct 13 17:42:36 2009
@@ -18,18 +18,17 @@
*/
package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.taglib.html.HtmlCommandLinkELTagBase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentBodyTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
-import java.io.IOException;
-import java.io.Reader;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -39,18 +38,19 @@
public abstract class UIComponentBodyTagBase
extends UIComponentBodyTag
{
- private static final Log log = LogFactory.getLog(UIComponentBodyTagBase.class);
+ //private static final Log log = LogFactory.getLog(UIComponentBodyTagBase.class);
+ private static final Logger log = Logger.getLogger(UIComponentBodyTagBase.class.getName());
public int doEndTag() throws JspException
{
- if (log.isWarnEnabled())
+ if (log.isLoggable(Level.WARNING))
{
UIComponent component = getComponentInstance();
if (component != null &&
component.getRendersChildren() &&
!isBodyContentEmpty())
{
- log.warn("Component with id '" + component.getClientId(getFacesContext()) +
+ log.warning("Component with id '" + component.getClientId(getFacesContext()) +
"' (" + getClass().getName() +
" tag) and path : "+org.apache.myfaces.shared.renderkit.RendererUtils.getPathToComponent(component)+"renders it's children, but has embedded JSP or HTML code. Use the <f:verbatim> tag for nested HTML. For comments use <%/* */%> style JSP comments instead of <!-- --> style HTML comments." +
"\n BodyContent:\n" + getBodyContent().getString().trim());
@@ -84,7 +84,7 @@
}
catch (IOException e)
{
- log.error("Error inspecting BodyContent", e);
+ log.log(Level.SEVERE, "Error inspecting BodyContent", e);
return false;
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java Tue Oct 13 17:42:36 2009
@@ -18,8 +18,7 @@
*/
package org.apache.myfaces.shared.taglib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
import javax.el.ELContext;
import javax.el.MethodExpression;
@@ -47,7 +46,8 @@
*/
public class UIComponentELTagUtils
{
- private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
+ //private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
+ private static final Logger log = Logger.getLogger(UIComponentELTagUtils.class.getName());
private UIComponentELTagUtils() {} //util class, no instantiation allowed
@@ -242,7 +242,7 @@
}
else
{
- log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+ log.severe("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
}
}
}
@@ -271,7 +271,7 @@
}
else
{
- log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+ log.severe("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
}
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java Tue Oct 13 17:42:36 2009
@@ -18,12 +18,16 @@
*/
package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
-import javax.faces.component.*;
+import javax.faces.component.ActionSource;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIGraphic;
+import javax.faces.component.UIParameter;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.el.MethodBinding;
@@ -32,6 +36,8 @@
import javax.faces.event.ValueChangeEvent;
import javax.faces.webapp.UIComponentTag;
+import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -40,7 +46,8 @@
*/
public class UIComponentTagUtils
{
- private static final Log log = LogFactory.getLog(UIComponentTagUtils.class);
+ //private static final Log log = LogFactory.getLog(UIComponentTagUtils.class);
+ private static final Logger log = Logger.getLogger(UIComponentTagUtils.class.getName());
private static final Class[] VALIDATOR_ARGS = {FacesContext.class,
UIComponent.class,
@@ -174,7 +181,7 @@
}
else
{
- log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+ log.severe("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
}
}
}
@@ -202,7 +209,7 @@
}
else
{
- log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+ log.severe("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
}
}
}
@@ -226,7 +233,7 @@
}
else
{
- log.error("Component " + component.getClientId(context) + " has invalid validation expression " + validator);
+ log.severe("Component " + component.getClientId(context) + " has invalid validation expression " + validator);
}
}
}
@@ -301,7 +308,7 @@
}
else
{
- log.error("Component " + component.getClientId(context) + " has invalid actionListener value: " + actionListener);
+ log.severe("Component " + component.getClientId(context) + " has invalid actionListener value: " + actionListener);
}
}
}
@@ -333,7 +340,7 @@
}
else
{
- log.error("Component " + component.getClientId(context) + " has invalid valueChangedListener expression " + valueChangedListener);
+ log.severe("Component " + component.getClientId(context) + " has invalid valueChangedListener expression " + valueChangedListener);
}
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java Tue Oct 13 17:42:36 2009
@@ -18,19 +18,24 @@
*/
package org.apache.myfaces.shared.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.FacesException;
-import javax.faces.context.FacesContext;
-import javax.el.ExpressionFactory;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Array;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.el.ExpressionFactory;
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
/**
@@ -42,7 +47,8 @@
{
//~ Static fields/initializers -----------------------------------------------------------------
- private static final Log log = LogFactory.getLog(ClassUtils.class);
+ //private static final Log log = LogFactory.getLog(ClassUtils.class);
+ private static final Logger log = Logger.getLogger(ClassUtils.class.getName());
public static final Class BOOLEAN_ARRAY_CLASS = boolean[].class;
public static final Class BYTE_ARRAY_CLASS = byte[].class;
@@ -196,7 +202,7 @@
}
catch (ClassNotFoundException e)
{
- log.error("Class " + type + " not found", e);
+ log.log(Level.SEVERE, "Class " + type + " not found", e);
throw new FacesException(e);
}
}
@@ -253,7 +259,7 @@
}
catch (ClassNotFoundException e)
{
- log.error("Class " + type + " not found", e);
+ log.log(Level.SEVERE, "Class " + type + " not found", e);
throw new FacesException(e);
}
}
@@ -289,7 +295,7 @@
}
catch (IOException e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw new FacesException(e);
}
}
@@ -338,17 +344,17 @@
}
catch(NoClassDefFoundError e)
{
- log.error("Class : "+clazz.getName()+" not found.",e);
+ log.log(Level.SEVERE, "Class : "+clazz.getName()+" not found.",e);
throw new FacesException(e);
}
catch (InstantiationException e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw new FacesException(e);
}
catch (IllegalAccessException e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw new FacesException(e);
}
}
@@ -366,7 +372,7 @@
{
String message = "Cannot coerce " + value.getClass().getName()
+ " to " + desiredClass.getName();
- log.error(message, e);
+ log.log(Level.SEVERE, message, e);
throw new FacesException(message, e);
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java Tue Oct 13 17:42:36 2009
@@ -20,9 +20,8 @@
import java.util.Locale;
import java.util.StringTokenizer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
@@ -31,7 +30,8 @@
*/
public final class LocaleUtils
{
- private static final Log log = LogFactory.getLog(LocaleUtils.class);
+ //private static final Log log = LogFactory.getLog(LocaleUtils.class);
+ private static final Logger log = Logger.getLogger(LocaleUtils.class.getName());
/** Utility class, do not instatiate */
private LocaleUtils()
@@ -51,8 +51,8 @@
if ((localeString == null) || (localeString.length() == 0))
{
Locale locale = Locale.getDefault();
- if(log.isWarnEnabled())
- log.warn("Locale name in faces-config.xml null or empty, setting locale to default locale : "+locale.toString());
+ if(log.isLoggable(Level.WARNING))
+ log.warning("Locale name in faces-config.xml null or empty, setting locale to default locale : "+locale.toString());
return locale;
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Tue Oct 13 17:42:36 2009
@@ -18,18 +18,18 @@
*/
package org.apache.myfaces.shared.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
/**
* Utility class to support multilingual FacesMessages using ResourceBundles.
@@ -59,7 +59,8 @@
/** Suffix for message details (<code>_detail</code>)*/
private static final String DETAIL_SUFFIX = "_detail";
- private static Log log = LogFactory.getLog(MessageUtils.class);
+ //private static Log log = LogFactory.getLog(MessageUtils.class);
+ private static Logger log = Logger.getLogger(MessageUtils.class.getName());
/**
* @param severity serverity of message
@@ -135,8 +136,8 @@
String forClientId,
FacesContext facesContext)
{
- if(log.isTraceEnabled()) {
- log.trace("adding message " + messageId + " for clientId " + forClientId);
+ if(log.isLoggable(Level.FINEST)) {
+ log.finest("adding message " + messageId + " for clientId " + forClientId);
}
facesContext.addMessage(forClientId,
getMessage(severity, messageId, args, facesContext));
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java Tue Oct 13 17:42:36 2009
@@ -20,22 +20,21 @@
import java.lang.reflect.Method;
import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* @author Martin Marinschek (latest modification by $Author: grantsmith $)
* @version $Revision: 169655 $ $Date: 2005-05-11 18:45:06 +0200 (Mi, 11 Mai 2005) $
*/
public class RestoreStateUtils
{
- private static Log log = LogFactory.getLog(RestoreStateUtils.class);
+ //private static Log log = LogFactory.getLog(RestoreStateUtils.class);
+ private static Logger log = Logger.getLogger(RestoreStateUtils.class.getName());
/**
* Walk the component tree, executing any component-bindings to reattach
@@ -69,7 +68,7 @@
}
catch (Throwable th)
{
- log.error("Exception while invoking handleBindings on component with client-id:"
+ log.log(Level.SEVERE, "Exception while invoking handleBindings on component with client-id:"
+parent.getClientId(facesContext),th);
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java Tue Oct 13 17:42:36 2009
@@ -33,7 +33,6 @@
import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.renderkit.RendererUtils;
/**
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Tue Oct 13 17:42:36 2009
@@ -18,33 +18,32 @@
*/
package org.apache.myfaces.shared.util;
-import org.apache.myfaces.shared.util.serial.SerialFactory;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-import javax.servlet.ServletContext;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Random;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
+import javax.servlet.ServletContext;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.myfaces.shared.util.serial.SerialFactory;
+
/**
* <p>Handles encryption, serialization, compression and encoding.
*
@@ -83,7 +82,8 @@
public final class StateUtils {
- private static final Log log = LogFactory.getLog(StateUtils.class);
+ //private static final Log log = LogFactory.getLog(StateUtils.class);
+ private static final Logger log = Logger.getLogger(StateUtils.class.getName());
public static final String ZIP_CHARSET = "ISO-8859-1";
@@ -440,13 +440,13 @@
cipher.init(mode, secretKey);
}
- if (log.isDebugEnabled())
+ if (log.isLoggable(Level.FINE))
{
String action = mode == Cipher.ENCRYPT_MODE ? "encrypting"
: "decrypting";
- log.debug(action + " w/ " + algorithm + "/" + algorithmParams);
+ log.fine(action + " w/ " + algorithm + "/" + algorithmParams);
}
return cipher.doFinal(data);
@@ -515,9 +515,9 @@
algorithmParams = DEFAULT_ALGORITHM_PARAMS;
}
- if (log.isDebugEnabled())
+ if (log.isLoggable(Level.FINE))
{
- log.debug("Using algorithm paramaters " + algorithmParams);
+ log.fine("Using algorithm paramaters " + algorithmParams);
}
return algorithmParams;
@@ -542,9 +542,9 @@
initParam = DEFAULT_ALGORITHM;
}
- if (log.isDebugEnabled())
+ if (log.isLoggable(Level.FINE))
{
- log.debug("Using algorithm " + initParam);
+ log.fine("Using algorithm " + initParam);
}
return initParam;
@@ -566,8 +566,8 @@
if(ctx == null)
throw new NullPointerException("ServletContext ctx");
- if (log.isDebugEnabled())
- log.debug("Storing SecretKey @ " + INIT_SECRET_KEY_CACHE);
+ if (log.isLoggable(Level.FINE))
+ log.fine("Storing SecretKey @ " + INIT_SECRET_KEY_CACHE);
// you want to create this as few times as possible
ctx.setAttribute(INIT_SECRET_KEY_CACHE, new SecretKeySpec(findSecret(ctx), findAlgorithm(ctx)));
@@ -584,8 +584,8 @@
bytes = new byte[length];
new Random().nextBytes(bytes);
- if(log.isDebugEnabled())
- log.debug("generated random password of length " + length);
+ if(log.isLoggable(Level.FINE))
+ log.fine("generated random password of length " + length);
}
else
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java Tue Oct 13 17:42:36 2009
@@ -18,7 +18,9 @@
*/
package org.apache.myfaces.shared.util.xml;
-import org.apache.commons.logging.Log;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -30,26 +32,26 @@
public class MyFacesErrorHandler
implements ErrorHandler
{
- private Log _log;
+ private Logger _log;
- public MyFacesErrorHandler(Log log)
+ public MyFacesErrorHandler(Logger log)
{
_log = log;
}
public void warning(SAXParseException exception)
{
- if (_log.isWarnEnabled()) _log.warn(getMessage(exception), exception);
+ if (_log.isLoggable(Level.WARNING)) _log.log(Level.WARNING, getMessage(exception), exception);
}
public void error(SAXParseException exception)
{
- _log.error(getMessage(exception), exception);
+ _log.log(Level.SEVERE, getMessage(exception), exception);
}
public void fatalError(SAXParseException exception)
{
- _log.fatal(getMessage(exception), exception);
+ _log.log(Level.SEVERE, getMessage(exception), exception);
}
private String getMessage(SAXParseException exception)
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Tue Oct 13 17:42:36 2009
@@ -18,13 +18,18 @@
*/
package org.apache.myfaces.shared.webapp.webxml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.config.MyfacesConfig;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
import javax.faces.webapp.FacesServlet;
-import java.util.*;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -32,7 +37,8 @@
*/
public class WebXml
{
- private static final Log log = LogFactory.getLog(WebXml.class);
+ //private static final Log log = LogFactory.getLog(WebXml.class);
+ private static final Logger log = Logger.getLogger(WebXml.class.getName());
private static long refreshPeriod;
@@ -52,7 +58,7 @@
{
if (_servlets.get(servletName) != null)
{
- log.warn("Servlet " + servletName + " defined more than once, first definition will be used.");
+ log.warning("Servlet " + servletName + " defined more than once, first definition will be used.");
}
else
{
@@ -64,7 +70,7 @@
{
if (_filters.get(filterName) != null)
{
- log.warn("Filter " + filterName + " defined more than once, first definition will be used.");
+ log.warning("Filter " + filterName + " defined more than once, first definition will be used.");
}
else
{
@@ -137,14 +143,14 @@
tempFacesServletMappings.add(new org.apache.myfaces.shared.webapp.webxml.ServletMapping(servletName,
servletClass,
urlpattern));
- if (log.isTraceEnabled())
- log.trace("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
}
}
}
else
{
- if (log.isTraceEnabled()) log.trace("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
+ if (log.isLoggable(Level.FINEST)) log.finest("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
}
}
@@ -185,8 +191,8 @@
String urlpattern = (String)it2.next();
tempExtensionsFilterMappings.add(new org.apache.myfaces.shared.webapp.webxml.FilterMapping(
filterName, filterClass, urlpattern));
- if (log.isTraceEnabled())
- log.trace("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
}
}
}
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Tue Oct 13 17:42:36 2009
@@ -21,14 +21,14 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
import org.apache.myfaces.shared.util.xml.XmlUtils;
@@ -45,7 +45,8 @@
*/
public class WebXmlParser
{
- private static final Log log = LogFactory.getLog(WebXmlParser.class);
+ //private static final Log log = LogFactory.getLog(WebXmlParser.class);
+ private static final Logger log = Logger.getLogger(WebXmlParser.class.getName());
/*
private static final String JAXP_SCHEMA_LANGUAGE =
@@ -93,7 +94,7 @@
if(is==null)
{
URL url = _context.getResource(WEB_XML_PATH);
- log.debug("No web-xml found at : "+(url==null?" null ":url.toString()));
+ log.fine("No web-xml found at : "+(url==null?" null ":url.toString()));
return _webXml;
}
@@ -112,7 +113,7 @@
}
catch (Exception e)
{
- log.fatal("Unable to parse web.xml", e);
+ log.log(Level.SEVERE, "Unable to parse web.xml", e);
throw new FacesException(e);
}
}
@@ -124,7 +125,7 @@
if (url != null)
return url.openConnection().getLastModified();
} catch (IOException e) {
- log.error("Could not find web.xml in path " + WEB_XML_PATH);
+ log.log(Level.SEVERE, "Could not find web.xml in path " + WEB_XML_PATH);
}
return 0L;
}
@@ -222,7 +223,7 @@
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
}
}
}
@@ -251,12 +252,12 @@
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
}
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
}
}
_webXml.addServlet(servletName, servletClass);
@@ -283,12 +284,12 @@
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
}
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
}
}
urlPattern = urlPattern.trim();
@@ -319,12 +320,12 @@
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
}
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
}
}
_webXml.addFilter(filterName, filterClass);
@@ -355,12 +356,12 @@
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
}
}
else
{
- if (log.isDebugEnabled()) log.debug("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
}
}
_webXml.addFilterMapping(filterName, urlPattern);
Modified: myfaces/shared/trunk_4.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/pom.xml?rev=824859&r1=824858&r2=824859&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/pom.xml (original)
+++ myfaces/shared/trunk_4.0.x/pom.xml Tue Oct 13 17:42:36 2009
@@ -123,11 +123,11 @@
<version>1.3</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
- </dependency>
+ </dependency -->
<!-- Test dependencies -->