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 [5/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/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.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.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
@@ -59,7 +59,7 @@ import java.util.Map;
 
 public class TabGroupRenderer extends LayoutComponentRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(TabGroupRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TabGroupRenderer.class);
 
   private static final String[] SCRIPTS = new String[]{"script/tab.js", "script/tabgroup.js"};
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java Sat May  1 11:30:00 2010
@@ -17,12 +17,12 @@ 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.LayoutComponentRendererBase;
 
 public class TabRenderer extends LayoutComponentRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(TabRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TabRenderer.class);
 
 }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java Sat May  1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
  * $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.component.Attributes;
 import org.apache.myfaces.tobago.component.UITextarea;
 //import org.apache.myfaces.tobago.context.Capability;
@@ -47,7 +47,7 @@ import java.io.IOException;
 
 public class TextAreaRenderer extends InputRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(TextAreaRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TextAreaRenderer.class);
 
   @Override
   public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Sat May  1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
  * $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.component.Attributes;
 import org.apache.myfaces.tobago.component.UITime;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -51,7 +51,7 @@ import java.util.Date;
 
 public class TimeRenderer extends InputRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(TimeRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TimeRenderer.class);
 
   private static final String[] SCRIPTS = {
       "script/calendar.js",

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.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.component.Attributes;
 import org.apache.myfaces.tobago.component.CreateComponentUtils;
 import org.apache.myfaces.tobago.component.Facets;
@@ -53,7 +53,7 @@ import java.util.List;
 
 public abstract class ToolBarRendererBase extends LayoutComponentRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(ToolBarRendererBase.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ToolBarRendererBase.class);
 
   @Override
   public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.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.Facets;
 import org.apache.myfaces.tobago.component.UITree;
@@ -56,7 +56,7 @@ import java.util.Map;
 
 public class TreeNodeRenderer extends CommandRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(TreeNodeRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TreeNodeRenderer.class);
 
   protected static final String OPEN_FOLDER
       = ResourceUtils.createString("image", "treeNode", "icon", "open", ResourceUtils.GIF);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java Sat May  1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
  * $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.component.Attributes;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
@@ -36,7 +36,7 @@ import java.io.IOException;
 
 public class VerbatimRenderer extends LayoutComponentRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(VerbatimRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(VerbatimRenderer.class);
 
   public void encodeEnd(FacesContext facesContext,
       UIComponent component) throws IOException {

Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.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.component.UITab;
 import org.apache.myfaces.tobago.renderkit.css.Overflow;
 import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -33,7 +33,7 @@ import java.io.IOException;
 public class TabGroupRenderer extends
     org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.TabGroupRenderer{
 
-  private static final Log LOG = LogFactory.getLog(TabGroupRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TabGroupRenderer.class);
 
   @Override
   protected void encodeContent(

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.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.component.UIMediator;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 public class MediatorRenderer extends LayoutComponentRendererBase {
 
-  private static final Log LOG = LogFactory.getLog(MediatorRenderer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(MediatorRenderer.class);
 
   @Override
   public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.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.Facets;
 import org.apache.myfaces.tobago.component.UIPopup;
@@ -43,7 +43,7 @@ import java.util.List;
 
 public class CommandRendererHelper {
 
-  private static final Log LOG = LogFactory.getLog(CommandRendererHelper.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CommandRendererHelper.class);
 
   private String onclick;
   private boolean disabled;

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.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.SupportsMarkup;
 import org.apache.myfaces.tobago.component.UICommand;
@@ -59,7 +59,7 @@ import java.util.Map;
  */
 public final class HtmlRendererUtils {
 
-  private static final Log LOG = LogFactory.getLog(HtmlRendererUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HtmlRendererUtils.class);
   private static final String ERROR_FOCUS_KEY = HtmlRendererUtils.class.getName() + ".ErrorFocusId";
 
   private HtmlRendererUtils() {

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.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.component.Attributes;
 import org.apache.myfaces.tobago.config.Configurable;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -46,7 +46,7 @@ import java.util.Map;
 
 public class RenderUtil {
 
-  private static final Log LOG = LogFactory.getLog(RenderUtil.class);
+  private static final Logger LOG = LoggerFactory.getLogger(RenderUtil.class);
 
   public static final String COMPONENT_IN_REQUEST = "org.apache.myfaces.tobago.component";
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Sat May  1 11:30:00 2010
@@ -74,8 +74,8 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/compat/FacesUtils.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.compat
  * 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.event.TabChangeSource;
 import org.apache.myfaces.tobago.event.ValueBindingPopupActionListener;
 import org.apache.myfaces.tobago.event.ValueBindingTabChangeListener;
@@ -41,7 +41,7 @@ import java.util.Comparator;
 @SuppressWarnings("deprecation")
 public class FacesUtils {
 
-  private static final Log LOG = LogFactory.getLog(FacesUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(FacesUtils.class);
 
   public static final Class[] VALIDATOR_ARGS = {FacesContext.class, UIComponent.class, Object.class};
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
  * 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.ComponentFindUtils;
 
 import javax.faces.component.StateHolder;
@@ -30,7 +30,7 @@ import javax.faces.event.ActionEvent;
 
 public class ValueBindingPopupActionListener extends AbstractPopupActionListener implements StateHolder {
 
-  private static final Log LOG = LogFactory.getLog(ValueBindingPopupActionListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueBindingPopupActionListener.class);
 
   private ValueBinding popupIdBinding;
 
@@ -70,4 +70,4 @@ public class ValueBindingPopupActionList
   public void setTransient(boolean newTransientValue) {
     // ignore
   }
-}
\ No newline at end of file
+}

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
  * 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.component.StateHolder;
 import javax.faces.component.UIComponentBase;
@@ -32,7 +32,7 @@ import javax.faces.el.ValueBinding;
 
 @SuppressWarnings("deprecation")
 public class ValueBindingTabChangeListener implements TabChangeListener, StateHolder {
-  private static final Log LOG = LogFactory.getLog(ValueBindingTabChangeListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueBindingTabChangeListener.class);
   private String type;
   private ValueBinding valueBinding;
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/ValueBindingComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/ValueBindingComparator.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/ValueBindingComparator.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.1/org/apache/myfaces/tobago/util/ValueBindingComparator.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.el.ValueBinding;
@@ -31,7 +31,7 @@ import java.util.Map;
 @SuppressWarnings("deprecation")
 public class ValueBindingComparator extends ComparatorBase {
 
-  private static final Log LOG = LogFactory.getLog(ValueBindingComparator.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueBindingComparator.class);
 
   private FacesContext facesContext;
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/compat/FacesUtils.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.compat
  * 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.event.TabChangeSource;
 import org.apache.myfaces.tobago.event.ValueExpressionPopupActionListener;
 import org.apache.myfaces.tobago.event.ValueExpressionTabChangeListener;
@@ -39,7 +39,7 @@ import java.util.Comparator;
 
 public class FacesUtils {
 
-  private static final Log LOG = LogFactory.getLog(FacesUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(FacesUtils.class);
 
   public static boolean invokeOnComponent(FacesContext context, UIComponent component,
                                           String clientId, ContextCallback callback) {

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
  * 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.ComponentFindUtils;
 
 import javax.el.ValueExpression;
@@ -31,7 +31,7 @@ import javax.faces.event.ActionEvent;
 
 public class ValueExpressionPopupActionListener extends AbstractPopupActionListener implements StateHolder {
 
-  private static final Log LOG = LogFactory.getLog(ValueExpressionPopupActionListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionPopupActionListener.class);
 
   private ValueExpression popupIdExpression;
 
@@ -71,4 +71,4 @@ public class ValueExpressionPopupActionL
   public void setTransient(boolean newTransientValue) {
     // ignore
   }
-}
\ No newline at end of file
+}

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java Sat May  1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.event;
  * 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.el.ValueExpression;
 import javax.faces.component.StateHolder;
@@ -27,7 +27,7 @@ import javax.faces.context.FacesContext;
 
 public class ValueExpressionTabChangeListener implements TabChangeListener, StateHolder {
 
-  private static final Log LOG = LogFactory.getLog(ValueExpressionTabChangeListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionTabChangeListener.class);
 
   private String type;
   private ValueExpression valueExpression;

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/ValueExpressionComparator.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.el.ValueExpression;
 import javax.faces.context.FacesContext;
@@ -27,7 +27,7 @@ import java.util.Map;
 
 public class ValueExpressionComparator extends ComparatorBase {
 
-  private static final Log LOG = LogFactory.getLog(ValueExpressionComparator.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ValueExpressionComparator.class);
 
   private FacesContext facesContext;
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/ActionListenerImpl.java Sat May  1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.applic
  * $Id$
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
@@ -39,7 +39,7 @@ import javax.faces.FacesException;
 
 public class ActionListenerImpl implements ActionListener {
 
-  private static final Log LOG = LogFactory.getLog(ActionListenerImpl.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ActionListenerImpl.class);
 
   private ActionListener base;
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/AbstractPopupActionListener.java Sat May  1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.event;
  */
 
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -30,7 +30,7 @@ import java.lang.reflect.InvocationTarge
 
 public abstract class AbstractPopupActionListener implements ActionListener {
 
-  private static final Log LOG = LogFactory.getLog(AbstractPopupActionListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractPopupActionListener.class);
 
   public void processAction(ActionEvent actionEvent) throws AbortProcessingException {
     UIComponent popup = getPopup(actionEvent);

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java Sat May  1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.util;
  */
 
 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 java.util.Comparator;
 import java.io.Serializable;
@@ -32,7 +32,7 @@ public class BeanComparator extends Comp
 
   private static final long serialVersionUID = -7450094725566090886L;
 
-  private static final Log LOG = LogFactory.getLog(BeanComparator.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BeanComparator.class);
 
   private String property;
 

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/util/RequestUtils.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 org.apache.myfaces.tobago.portlet.PortletUtils;
 
 import javax.faces.context.FacesContext;
@@ -31,7 +31,7 @@ import java.io.UnsupportedEncodingExcept
  */
 public class RequestUtils {
 
-  private static final Log LOG = LogFactory.getLog(RequestUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(RequestUtils.class);
 
   public static void ensureEncoding(FacesContext facesContext) {
     Object requestObject = facesContext.getExternalContext().getRequest();

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java Sat May  1 11:30:00 2010
@@ -22,8 +22,8 @@ import net.sf.maventaglib.checker.TagAtt
 import net.sf.maventaglib.checker.Tld;
 import net.sf.maventaglib.checker.TldParser;
 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.mock.faces.MockExternalContext;
 import org.apache.myfaces.tobago.mock.faces.MockFacesContext;
 import org.apache.myfaces.tobago.mock.servlet.MockHttpServletRequest;
@@ -54,7 +54,7 @@ import java.util.HashMap;
 //import org.apache.myfaces.tobago.mock.servlet.MockPageContext;
 
 public abstract class GenericTestBase extends TestCase {
-  private static final Log LOG = LogFactory.getLog(GenericTestBase.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GenericTestBase.class);
 
   protected Tld[] tlds;
   protected String[] tldPaths;

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Sat May  1 11:30:00 2010
@@ -53,8 +53,8 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.modello</groupId>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/PrintAnnotationVisitor.java Sat May  1 11:30:00 2010
@@ -28,8 +28,8 @@ import com.sun.tools.apt.mirror.declarat
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * Created: Mar 22, 2005 8:10:05 PM
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  * $Id$
  */
 public class PrintAnnotationVisitor extends AnnotationDeclarationVisitorCollector {
-  private static final Log LOG = LogFactory.getLog(PrintAnnotationVisitor.class);
+  private static final Logger LOG = LoggerFactory.getLogger(PrintAnnotationVisitor.class);
   public void print() {
     for (ClassDeclaration decl : getCollectedClassDeclarations()) {
       printClassDeclaration(decl);