You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/05/01 13:30:06 UTC
svn commit: r939978 [2/5] - in /myfaces/tobago/trunk: ./ core/
core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces...
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.layout.Interval;
import org.apache.myfaces.tobago.internal.layout.IntervalList;
import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.layout.
*/
public abstract class AbstractUISheetLayout extends UILayoutBase implements LayoutManager {
- private static final Log LOG = LogFactory.getLog(AbstractUIGridLayout.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIGridLayout.class);
private boolean horizontalAuto;
private boolean verticalAuto;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.ComponentTypes;
@@ -52,7 +52,7 @@ import java.util.List;
public abstract class AbstractUITabGroup extends UIPanelBase
implements TabChangeSource, ActionSource, LayoutContainer, LayoutComponent, OnComponentPopulated {
- private static final Log LOG = LogFactory.getLog(AbstractUITabGroup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUITabGroup.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TabGroup";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroupLayout.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.layout.Interval;
import org.apache.myfaces.tobago.internal.layout.IntervalList;
import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.layout.
public abstract class AbstractUITabGroupLayout extends UILayoutBase implements LayoutManager {
- private static final Log LOG = LogFactory.getLog(AbstractUIGridLayout.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIGridLayout.class);
private boolean horizontalAuto;
private boolean verticalAuto;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.TreeModelBuilder;
import org.apache.myfaces.tobago.model.MixedTreeModel;
import org.apache.myfaces.tobago.model.Node;
@@ -41,7 +41,7 @@ import java.util.Map;
public abstract class AbstractUITreeData extends javax.faces.component.UIInput
implements NamingContainer, TreeModelBuilder {
- private static final Log LOG = LogFactory.getLog(AbstractUITreeData.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUITreeData.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.TreeData";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.TreeModelBuilder;
import org.apache.myfaces.tobago.event.TreeExpansionEvent;
@@ -38,7 +38,7 @@ import java.util.List;
public abstract class AbstractUITreeNode extends UICommandBase implements SupportsMarkup, TreeModelBuilder {
- private static final Log LOG = LogFactory.getLog(AbstractUITreeNode.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUITreeNode.class);
private int depth;
private boolean folder;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UICommandBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UICommandBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UICommandBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UICommandBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.compat.InvokeOnComponent;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
@@ -35,7 +35,7 @@ import java.util.Iterator;
public abstract class UICommandBase extends javax.faces.component.UICommand
implements InvokeOnComponent, SupportsRenderedPartially {
- private static final Log LOG = LogFactory.getLog(UICommandBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UICommandBase.class);
public static final String COMMAND_TYPE_SUBMIT = "submit";
public static final String COMMAND_TYPE_RESET = "reset";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import javax.faces.context.FacesContext;
@@ -34,7 +34,7 @@ import java.util.Map;
*/
public class ResponseWriterDivider {
- private static final Log LOG = LogFactory.getLog(ResponseWriterDivider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResponseWriterDivider.class);
private List<ResponseWriter> writers;
private List<FastStringWriter> buffers;
@@ -86,7 +86,7 @@ public class ResponseWriterDivider {
}
facesContext.setResponseWriter(writers.get(current));
if (LOG.isDebugEnabled()) {
- LOG.debug(this);
+ LOG.debug(this.toString());
}
return created;
}
@@ -106,13 +106,13 @@ public class ResponseWriterDivider {
if (current >= 0) {
facesContext.setResponseWriter(writers.get(current));
if (LOG.isDebugEnabled()) {
- LOG.debug(this);
+ LOG.debug(this.toString());
}
return true;
} else {
facesContext.setResponseWriter(original);
if (LOG.isDebugEnabled()) {
- LOG.debug(this);
+ LOG.debug(this.toString());
}
return false;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/FactorList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/FactorList.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/FactorList.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/FactorList.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.Measure;
import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
public class FactorList extends ArrayList<Integer> {
- private static final Log LOG = LogFactory.getLog(FactorList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FactorList.class);
public List<Measure> partition(Measure size) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/Grid.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Orientation;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
@@ -29,7 +29,7 @@ import java.util.List;
public class Grid {
- private static final Log LOG = LogFactory.getLog(Grid.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Grid.class);
// TODO: check if it is faster with arrays.
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/IntervalList.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.Measure;
import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
public class IntervalList extends ArrayList<Interval> {
- private static final Log LOG = LogFactory.getLog(IntervalList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IntervalList.class);
private Measure minimum;
private Measure current;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
import org.apache.myfaces.tobago.layout.LayoutBase;
import org.apache.myfaces.tobago.layout.LayoutContainer;
@@ -54,7 +54,7 @@ todo: describe what happens, when there
*/
public class LayoutContext {
- private static final Log LOG = LogFactory.getLog(LayoutContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LayoutContext.class);
private LayoutContainer container;
@@ -81,7 +81,7 @@ public class LayoutContext {
private void log() {
StringBuffer buffer = new StringBuffer("\n");
log(buffer, (UIComponent) container, 0);
- LOG.info(buffer);
+ LOG.info(buffer.toString());
}
private void log(StringBuffer buffer, UIComponent component, int depth) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.Form;
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
public final class LayoutUtils {
- private static final Log LOG = LogFactory.getLog(LayoutUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LayoutUtils.class);
private static final Pattern TOKEN_PATTERN = Pattern.compile("^(\\d*px|\\d*\\*|\\d*%|fixed)$");
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.component.UIViewRoot;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -41,7 +41,7 @@ import java.util.Map;
class ApplyRequestValuesExecutor implements PhaseExecutor {
@SuppressWarnings("UnusedDeclaration")
- private static final Log LOG = LogFactory.getLog(ApplyRequestValuesExecutor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplyRequestValuesExecutor.class);
private ContextCallback contextCallback;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
@@ -35,7 +35,7 @@ import java.util.Map;
*/
class PhaseListenerManager {
- private static final Log LOG = LogFactory.getLog(PhaseListenerManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PhaseListenerManager.class);
private Lifecycle lifecycle;
private FacesContext facesContext;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.portlet.PortletUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -46,7 +46,7 @@ import java.util.Map;
*/
class RestoreViewExecutor implements PhaseExecutor {
- private static final Log LOG = LogFactory.getLog(RestoreViewExecutor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestoreViewExecutor.class);
public boolean execute(FacesContext facesContext) {
ExternalContext externalContext = facesContext.getExternalContext();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.util.DebugUtils;
import org.apache.myfaces.tobago.util.RequestUtils;
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class TobagoLifecycle extends Lifecycle {
- private static final Log LOG = LogFactory.getLog(TobagoLifecycle.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoLifecycle.class);
public static final String VIEW_ROOT_KEY = TobagoLifecycle.class.getName() + ".VIEW_ROOT_KEY";
public static final String FACES_MESSAGES_KEY = TobagoLifecycle.class.getName() + ".FACES_MESSAGES_KEY";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
@@ -26,7 +26,7 @@ import java.util.Iterator;
public class TobagoLifecycleFactory extends LifecycleFactory {
- private static final Log LOG = LogFactory.getLog(TobagoLifecycleFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoLifecycleFactory.class);
private LifecycleFactory factory;
private TobagoLifecycle defaultLifecycle;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.InputSuggest;
import org.apache.myfaces.tobago.el.ConstantMethodBinding;
@@ -45,7 +45,7 @@ import java.lang.reflect.InvocationTarge
public class TagUtils {
- private static final Log LOG = LogFactory.getLog(TagUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TagUtils.class);
public static void setIntegerProperty(UIComponent component, String name, String value) {
if (value != null) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.intern
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
@@ -31,7 +31,7 @@ import javax.servlet.jsp.tagext.BodyTag;
public abstract class TobagoBodyTag extends TobagoTag implements BodyTag {
- private static final Log LOG = LogFactory.getLog(TobagoBodyTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoBodyTag.class);
private BodyContent bodyContent;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class Deprecation {
@@ -28,12 +28,12 @@ public final class Deprecation {
}
/**
- * This Log object should help to detect the usage of deprecated code.
+ * This Logger object should help to detect the usage of deprecated code.
* The main reason for this class is the lack of a "deprecated concept"
* for tag libraries. Thought the designer of a Tobago page cannot see
* in his IDE that a tag or attribute is deprecated.
* <p>
- * The Tobago Java code will log into this Log object, with
+ * The Tobago Java code will log into this Logger object, with
* <dl>
* <dt><code>error</code></dt>
* <dd>when the code is deprecated with a loss of function, or</dd>
@@ -41,9 +41,9 @@ public final class Deprecation {
* <dd>when the code is deprecated, but still works.</dd>
* </dl>
* <p>
- * This Log category can be switched off, in production environment without
+ * This Logger category can be switched off, in production environment without
* affecting the normal logging category.
*/
- public static final Log LOG = LogFactory.getLog(Deprecation.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Deprecation.class);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.naming.Binding;
import javax.naming.Context;
@@ -27,7 +27,7 @@ import javax.naming.NamingException;
public class JndiUtils {
- private static final Log LOG = LogFactory.getLog(JndiUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JndiUtils.class);
public static Object getJndiProperty(Context ctx, String... path) throws NamingException {
return getJndiProperty(ctx, null, path);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
public class ResponseUtils {
- private static final Log LOG = LogFactory.getLog(ResponseUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResponseUtils.class);
private ResponseUtils() {
// utils class
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Writer;
@@ -39,7 +39,7 @@ import java.io.Writer;
*/
public class ResponseWriterBuffer {
- private static final Log LOG = LogFactory.getLog(ResponseWriterBuffer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResponseWriterBuffer.class);
private static final int BUFFER_SIZE = 64;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRes
import java.io.IOException;
public class DebugContentTypeFilter implements Filter {
- private static final Log LOG = LogFactory.getLog(DebugContentTypeFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugContentTypeFilter.class);
public void init(FilterConfig filterConfig) throws ServletException {
if (LOG.isInfoEnabled()) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java Sat May 1 11:30:00 2010
@@ -17,14 +17,14 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
public class DebugContentTypeResponse extends HttpServletResponseWrapper {
- private static final Log LOG = LogFactory.getLog(DebugContentTypeResponse.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugContentTypeResponse.class);
public DebugContentTypeResponse(HttpServletResponse response) {
super(response);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.intern
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -35,7 +35,7 @@ public class DebugTobagoResponseWriterWr
private Stack<String> stack = new Stack<String>();
- private static final Log LOG = LogFactory.getLog(DebugTobagoResponseWriterWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugTobagoResponseWriterWrapper.class);
private final TobagoResponseWriter responseWriter;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoMultipartFormdataRequest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoMultipartFormdataRequest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoMultipartFormdataRequest.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoMultipartFormdataRequest.java Sat May 1 11:30:00 2010
@@ -21,8 +21,8 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
import javax.faces.FacesException;
@@ -39,8 +39,8 @@ import java.util.Map;
public class TobagoMultipartFormdataRequest extends HttpServletRequestWrapper {
- private static final Log LOG
- = LogFactory.getLog(TobagoMultipartFormdataRequest.class);
+ private static final Logger LOG
+ = LoggerFactory.getLogger(TobagoMultipartFormdataRequest.class);
public static final long ONE_KB = 1024;
public static final long ONE_MB = ONE_KB * ONE_KB;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponse.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
@@ -29,7 +29,7 @@ import java.io.StringWriter;
public class TobagoResponse extends HttpServletResponseWrapper {
- private static final Log LOG = LogFactory.getLog(TobagoResponse.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoResponse.class);
private PrintWriter printWriter = null;
private StringWriter bufferedWriter = null;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseJsonWriterImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
import org.apache.myfaces.tobago.internal.util.FastStringWriter;
@@ -28,7 +28,7 @@ import java.io.Writer;
public class TobagoResponseJsonWriterImpl extends TobagoResponseWriterImpl {
- private static final Log LOG = LogFactory.getLog(TobagoResponseWriterImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseWriterImpl.class);
private Writer javascriptWriter;
private boolean javascriptMode;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.intern
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
@@ -34,7 +34,7 @@ import java.util.Set;
public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
- private static final Log LOG = LogFactory.getLog(TobagoResponseWriterBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseWriterBase.class);
protected static final Set<String> EMPTY_TAG = new HashSet<String>(Arrays.asList(
HtmlConstants.BR,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.layout
*/
import org.apache.commons.lang.math.NumberUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Iterator;
@@ -28,7 +28,7 @@ import java.util.StringTokenizer;
public final class LayoutTokens implements Iterable<LayoutToken> {
- private static final Log LOG = LogFactory.getLog(LayoutTokens.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LayoutTokens.class);
private List<LayoutToken> tokens = new ArrayList<LayoutToken>();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.layout
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.util.List;
@@ -28,7 +28,7 @@ public abstract class Measure implements
private static final long serialVersionUID = 1L;
- private static final Log LOG = LogFactory.getLog(Measure.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Measure.class);
public static final Measure ZERO = valueOf(0);
public static final Measure MAX = valueOf(Integer.MAX_VALUE);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Date: 23.01.2008 20:21:08
*/
public final class PixelMeasure extends Measure {
- private static final Log LOG = LogFactory.getLog(PixelMeasure.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PixelMeasure.class);
static final Measure[] PIXEL_CACHE;
static final int PIXEL_CACHE_MAX = 4000;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.model;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeNode;
@@ -31,7 +31,7 @@ import java.util.Stack;
*/
public class MixedTreeModel {
- private static final Log LOG = LogFactory.getLog(MixedTreeModel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MixedTreeModel.class);
private Node root;
private Node current;
@@ -40,7 +40,7 @@ public class MixedTreeModel {
public void beginBuildNode(AbstractUITreeNode node) {
if (LOG.isDebugEnabled()) {
- LOG.debug(node.getAttributes().get(Attributes.LABEL));
+ LOG.debug("{}", node.getAttributes().get(Attributes.LABEL));
}
Node newNode = new Node();
newNode.setLabel((String) node.getAttributes().get(Attributes.LABEL));
@@ -55,7 +55,7 @@ public class MixedTreeModel {
public void endBuildNode(AbstractUITreeNode node) {
if (LOG.isDebugEnabled()) {
- LOG.debug(node.getAttributes().get(Attributes.LABEL));
+ LOG.debug("{}", node.getAttributes().get(Attributes.LABEL));
}
current = current.getParent();
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.model;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
@@ -31,7 +31,7 @@ import java.util.List;
// TODO find a better solution for this
public class SheetState implements Serializable {
private static final long serialVersionUID = 7765536344426661777L;
- private static final Log LOG = LogFactory.getLog(SheetState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SheetState.class);
public static final String SEPARATOR = ",";
private int first = -1;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/Wizard.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.model;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.event.ActionEvent;
import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.List;
public class Wizard {
- private static final Log LOG = LogFactory.getLog(Wizard.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Wizard.class);
private int index;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.ThemeConfig;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -31,7 +31,7 @@ import java.io.IOException;
public abstract class AbstractRendererBaseWrapper extends RendererBase {
- private static final Log LOG = LogFactory.getLog(AbstractRendererBaseWrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractRendererBaseWrapper.class);
@Override
public final void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java Sat May 1 11:30:00 2010
@@ -23,12 +23,12 @@ package org.apache.myfaces.tobago.render
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class BoxRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(BoxRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BoxRendererBase.class);
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -28,7 +28,7 @@ import javax.faces.event.ActionEvent;
public abstract class CommandRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(CommandRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CommandRendererBase.class);
public void decode(FacesContext facesContext, UIComponent component) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
@@ -28,7 +28,7 @@ import java.util.Map;
public class InputRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(InputRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputRendererBase.class);
public void decode(FacesContext context, UIComponent component) {
UIInput uiInput;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.RendererTypes;
@@ -28,7 +28,7 @@ import java.util.Locale;
public final class LabelWithAccessKey {
- private static final Log LOG = LogFactory.getLog(LabelWithAccessKey.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LabelWithAccessKey.class);
private String text;
private Character accessKey;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
import org.apache.myfaces.tobago.layout.Box;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -29,7 +29,7 @@ import javax.faces.context.FacesContext;
public class PageRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(PageRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PageRendererBase.class);
public void decode(FacesContext facesContext, UIComponent component) {
if (component instanceof AbstractUIPage) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -38,7 +38,7 @@ import java.util.Locale;
public class RendererBase extends Renderer {
- private static final Log LOG = LogFactory.getLog(RendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RendererBase.class);
private ResourceManager resourceManager;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.FacesException;
@@ -36,7 +36,7 @@ import java.util.List;
public class SelectManyRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectManyRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectManyRendererBase.class);
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
@@ -27,7 +27,7 @@ import javax.faces.context.FacesContext;
public abstract class SelectOneRendererBase extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectOneRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectOneRendererBase.class);
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.internal.webapp.DebugTobagoResponseWriterWrapper;
@@ -42,7 +42,7 @@ import java.util.Map;
public class TobagoRenderKit extends RenderKit {
- private static final Log LOG = LogFactory.getLog(TobagoRenderKit.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoRenderKit.class);
public static final String RENDER_KIT_ID = "tobago";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -34,7 +34,7 @@ import java.io.IOException;
* Time: 10:59:19
*/
public class TobagoResponseStateManager extends ResponseStateManager {
- private static final Log LOG = LogFactory.getLog(TobagoResponseStateManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoResponseStateManager.class);
private static final String TREE_PARAM = "jsf_tree";
private static final String STATE_PARAM = "javax.faces.ViewState";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.collections.set.ListOrderedSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.context.Markup;
@@ -40,7 +40,7 @@ public class StyleClasses implements Ser
private static final long serialVersionUID = 3738052927067803517L;
- private static final Log LOG = LogFactory.getLog(StyleClasses.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StyleClasses.class);
public static final char SEPARATOR = '-';
public static final String PREFIX = "tobago" + SEPARATOR;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.servle
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
@@ -39,7 +39,7 @@ public abstract class NonFacesRequestSer
private static final long serialVersionUID = -7448621953821447997L;
- private static final Log LOG = LogFactory.getLog(NonFacesRequestServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NonFacesRequestServlet.class);
@Override
protected void service(HttpServletRequest request, HttpServletResponse response)
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.servle
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import javax.servlet.ServletConfig;
@@ -61,7 +61,7 @@ public class ResourceServlet extends Htt
private static final long serialVersionUID = -4491419290205206466L;
- private static final Log LOG = LogFactory.getLog(ResourceServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceServlet.class);
private Long expires;
private int bufferSize;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -43,7 +43,7 @@ public abstract class TabChangeListenerT
private static final long serialVersionUID = -419199086962377873L;
- private static final Log LOG = LogFactory.getLog(TabChangeListenerTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TabChangeListenerTag.class);
/**
* Fully qualified Java class name of a TabChangeListener to be
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.util;
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRes
public class ApplyRequestValuesCallback implements TobagoCallback {
@SuppressWarnings("UnusedDeclaration")
- private static final Log LOG = LogFactory.getLog(ApplyRequestValuesCallback.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplyRequestValuesCallback.class);
public void invokeContextCallback(FacesContext context, UIComponent component) {
if (context instanceof TobagoFacesContext && ((TobagoFacesContext) context).isAjax()) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Sat May 1 11:30:00 2010
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.util;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
@@ -68,7 +68,7 @@ import java.util.Map;
public class ComponentUtils {
- private static final Log LOG = LogFactory.getLog(ComponentUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ComponentUtils.class);
public static final String SUB_SEPARATOR = "::";
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.event.ActionListener;
import javax.faces.event.ActionEvent;
@@ -30,7 +30,7 @@ import javax.faces.event.AbortProcessing
*/
public class DebugActionListener implements ActionListener {
- private static final Log LOG = LogFactory.getLog(DebugActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugActionListener.class);
private ActionListener actionListener;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
@@ -29,7 +29,7 @@ import javax.faces.context.FacesContext;
*/
public class DebugNavigationHandler extends NavigationHandler {
- private static final Log LOG = LogFactory.getLog(DebugNavigationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugNavigationHandler.class);
private NavigationHandler navigationHandler;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.faces.context.ExternalContext;
@@ -36,7 +36,7 @@ import java.text.MessageFormat;
* Time: 7:50:25 PM
*/
public class DebugPhaseListener implements PhaseListener {
- private static final Log LOG = LogFactory.getLog(DebugPhaseListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugPhaseListener.class);
private static final String KEY = DebugPhaseListener.class.getName() + "_ID_";
@SuppressWarnings("unchecked")
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.util;
*/
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.HideLayoutToken;
import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
@@ -36,7 +36,7 @@ import java.util.List;
@Deprecated
public class LayoutInfo {
- private static final Log LOG = LogFactory.getLog(LayoutInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LayoutInfo.class);
private static final int FREE = -1;
public static final int HIDE = -2;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.valida
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
@@ -36,8 +36,8 @@ import java.util.StringTokenizer;
public class ClearValidatorsActionListener implements ActionListener {
- private static final Log LOG
- = LogFactory.getLog(ClearValidatorsActionListener.class);
+ private static final Logger LOG
+ = LoggerFactory.getLogger(ClearValidatorsActionListener.class);
public PhaseId getPhaseId() {
return PhaseId.APPLY_REQUEST_VALUES;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.webapp
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
@@ -36,7 +36,7 @@ import java.io.IOException;
public class LogoutActionListener implements ActionListener {
- private static final Log LOG = LogFactory.getLog(LogoutActionListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogoutActionListener.class);
public void processAction(ActionEvent event) throws AbortProcessingException {
FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.webapp
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.webapp.TobagoMultipartFormdataRequest;
import javax.servlet.Filter;
@@ -66,7 +66,7 @@ import java.util.Locale;
*/
public class TobagoMultipartFormdataFilter implements Filter {
- private static final Log LOG = LogFactory.getLog(TobagoMultipartFormdataFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoMultipartFormdataFilter.class);
private String repositoryPath = System.getProperty("java.io.tmpdir");
private long maxSize = TobagoMultipartFormdataRequest.ONE_MB;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.webapp
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.config.TobagoConfigParser;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -29,8 +29,8 @@ import javax.servlet.ServletContextListe
public class TobagoServletContextListener implements ServletContextListener {
- private static final Log LOG
- = LogFactory.getLog(TobagoServletContextListener.class);
+ private static final Logger LOG
+ = LoggerFactory.getLogger(TobagoServletContextListener.class);
public void contextInitialized(ServletContextEvent event) {
@@ -60,9 +60,9 @@ public class TobagoServletContextListene
tobagoConfig.resolveThemes();
tobagoConfig.initProjectState(servletContext);
} catch (Throwable e) {
- if (LOG.isFatalEnabled()) {
+ if (LOG.isErrorEnabled()) {
String error = "Error while deploy process. Tobago can't be initialized! Application will not run!";
- LOG.fatal(error, e);
+ LOG.error(error, e);
throw new RuntimeException(error, e);
}
}
@@ -80,7 +80,7 @@ public class TobagoServletContextListene
ResourceManagerFactory.release(servletContext);
- LogFactory.releaseAll();
+ //LogFactory.releaseAll();
// LogManager.shutdown();
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.webapp
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import javax.faces.FactoryFinder;
@@ -40,7 +40,7 @@ public class WeblogicWorkaroundServlet e
private static final long serialVersionUID = -8636608446986072719L;
- private static final Log LOG = LogFactory.getLog(WeblogicWorkaroundServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WeblogicWorkaroundServlet.class);
public void init() throws ServletException {
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.RenderersConfig;
@@ -55,7 +55,7 @@ import java.util.Map;
public class GenericComponentTagUnitTest extends GenericTestBase {
- private static final Log LOG = LogFactory.getLog(GenericComponentTagUnitTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GenericComponentTagUnitTest.class);
private Application application;
private MockFacesContext facesContext;