You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/09/18 11:02:29 UTC

svn commit: r1703781 [2/3] - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-core/src/main/java/org/apache/myfaces/tobago/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ tobago-core/src/main/java/org/apache/myfaces/tobago/i...

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Fri Sep 18 09:02:27 2015
@@ -26,12 +26,10 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
 import org.apache.myfaces.tobago.component.SupportsStyle;
 import org.apache.myfaces.tobago.component.UITab;
+import org.apache.myfaces.tobago.config.Configurable;
 import org.apache.myfaces.tobago.event.TabChangeEvent;
 import org.apache.myfaces.tobago.event.TabChangeListener;
 import org.apache.myfaces.tobago.event.TabChangeSource2;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
-import org.apache.myfaces.tobago.layout.LayoutManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +47,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class AbstractUITabGroup extends AbstractUIPanel
-    implements TabChangeSource2, ActionSource2, LayoutContainer, LayoutComponent, OnComponentPopulated,
+    implements TabChangeSource2, ActionSource2, Configurable, OnComponentPopulated,
     SupportsRenderedPartially, SupportsStyle {
 
   private static final Logger LOG = LoggerFactory.getLogger(AbstractUITabGroup.class);
@@ -61,24 +59,11 @@ public abstract class AbstractUITabGroup
   public static final String SWITCH_TYPE_RELOAD_TAB = "reloadTab";
 
   @Override
-  public void encodeBegin(final FacesContext facesContext) throws IOException {
-
-    super.encodeBegin(facesContext);
-
-//    ((AbstractUILayoutBase) getLayoutManager()).encodeBegin(facesContext);
-  }
-
-  @Override
   public void encodeChildren(final FacesContext facesContext) throws IOException {
-
-//    ((AbstractUILayoutBase) getLayoutManager()).encodeChildren(facesContext);
   }
 
   @Override
   public void encodeEnd(final FacesContext facesContext) throws IOException {
-
-//    ((AbstractUILayoutBase) getLayoutManager()).encodeEnd(facesContext);
-
     resetTabLayout();
     super.encodeEnd(facesContext);
     setRenderedIndex(getSelectedIndex());
@@ -318,17 +303,4 @@ public abstract class AbstractUITabGroup
   public void onComponentPopulated(final FacesContext facesContext, final UIComponent parent) {
     super.onComponentPopulated(facesContext, parent);
   }
-
-  public LayoutManager getLayoutManager() {
-    return (LayoutManager) getFacet(Facets.LAYOUT);
-  }
-
-  public void setLayoutManager(final LayoutManager layoutManager) {
-    getFacets().put(Facets.LAYOUT, (AbstractUILayoutBase) layoutManager);
-  }
-
-  public boolean isLayoutChildren() {
-    return isRendered();
-  }
-
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIToolBar.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIToolBar.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIToolBar.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIToolBar.java Fri Sep 18 09:02:27 2015
@@ -19,10 +19,9 @@
 
 package org.apache.myfaces.tobago.internal.component;
 
-import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.config.Configurable;
 
-public abstract class AbstractUIToolBar extends javax.faces.component.UIPanel
-    implements LayoutComponent {
+public abstract class AbstractUIToolBar extends javax.faces.component.UIPanel implements Configurable {
 
   public static final String LABEL_BOTTOM = "bottom";
   public static final String LABEL_RIGHT = "right";

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java Fri Sep 18 09:02:27 2015
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.intern
 
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsStyle;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
+import org.apache.myfaces.tobago.config.Configurable;
 import org.apache.myfaces.tobago.model.ExpandedState;
 import org.apache.myfaces.tobago.model.SelectedState;
 import org.apache.myfaces.tobago.model.TreeState;
@@ -32,7 +32,7 @@ import javax.faces.component.NamingConta
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-public abstract class AbstractUITree extends AbstractUIData implements NamingContainer, LayoutComponent, SupportsStyle {
+public abstract class AbstractUITree extends AbstractUIData implements NamingContainer, Configurable, SupportsStyle {
 
   public static final String MESSAGE_NOT_LEAF = "tobago.tree.MESSAGE_NOT_LEAF";
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutUtils.java Fri Sep 18 09:02:27 2015
@@ -19,10 +19,8 @@
 
 package org.apache.myfaces.tobago.internal.layout;
 
-import org.apache.myfaces.tobago.internal.component.AbstractUIFlexLayout;
-import org.apache.myfaces.tobago.internal.component.AbstractUIFlowLayout;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
+import org.apache.myfaces.tobago.component.Facets;
+import org.apache.myfaces.tobago.config.Configurable;
 
 import javax.faces.component.UIComponent;
 import java.util.ArrayList;
@@ -49,16 +47,15 @@ public final class LayoutUtils {
     return true;
   }
 
-  public static List<UIComponent> findLayoutChildren(final LayoutContainer container) {
+  public static List<UIComponent> findLayoutChildren(final UIComponent container) {
     final List<UIComponent> result = new ArrayList<UIComponent>();
-    addLayoutChildren((UIComponent) container, result);
+    addLayoutChildren(container, result);
     return result;
   }
 
   private static void addLayoutChildren(final UIComponent component, final List<UIComponent> result) {
     for (final UIComponent child : component.getChildren()) {
-      if (child instanceof LayoutComponent
-          || child instanceof AbstractUIFlowLayout || child instanceof AbstractUIFlexLayout) {
+      if (child instanceof Configurable) {
         result.add(child);
       } else {
         // Child seems to be transparent for layout, like UIForm. 
@@ -68,8 +65,7 @@ public final class LayoutUtils {
     }
 
     final UIComponent child = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
-    if (child instanceof LayoutComponent
-        || child instanceof AbstractUIFlowLayout || child instanceof AbstractUIFlexLayout) {
+    if (child instanceof Configurable) {
       result.add(child);
     } else if (child != null) {
       // Child seems to be transparent for layout, like UIForm.
@@ -77,4 +73,28 @@ public final class LayoutUtils {
       addLayoutChildren(child, result);
     }
   }
+
+  /**
+   * Replacement for refactoring
+   * @since 3.0.0
+   * @deprecated since 3.0.0
+   */
+  @Deprecated
+  public static UIComponent getLayoutManager(UIComponent component) {
+    final UIComponent base;
+
+    final UIComponent compositeFacet = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
+    if (compositeFacet != null) {
+      base = compositeFacet.getChildren().get(0);
+    } else {
+      base = component;
+    }
+
+    final UIComponent layoutFacet = base.getFacet(Facets.LAYOUT);
+    if (layoutFacet != null) {
+      return layoutFacet;
+    } else {
+      return null;
+    }
+  }
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -31,8 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsCollapsible;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -49,11 +47,11 @@ import javax.faces.component.UIPanel;
     facets = {
         @Facet(name = Facets.TOOL_BAR, description = "Contains an instance of UIToolBar",
             allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar"),
-        @Facet(name = Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
-            allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
+        @Facet(name=Facets.LAYOUT, description = "Deprecated. Contains an layout manager. "
+            + "The layout manager tag should surround the content instead.")})
 
 public interface BoxTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup,
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup,
     HasCurrentMarkup, HasLabel, HasTip, IsCollapsible {
 
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -37,7 +37,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDefaultCommand;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -48,10 +47,9 @@ import javax.faces.component.UICommand;
 @BodyContentDescription(anyTagOf = "facestag")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIButton",
-    uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
+    uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIButton",
     uiComponentFacesClass = "javax.faces.component.UICommand",
     interfaces = {
-        "org.apache.myfaces.tobago.layout.LayoutComponent",
         "org.apache.myfaces.tobago.component.SupportsAccessKey"
     },
     componentFamily = UICommand.COMPONENT_FAMILY,
@@ -64,6 +62,5 @@ import javax.faces.component.UICommand;
             allowedChildComponenents = "org.apache.myfaces.tobago.Popup")})
 public interface ButtonTagDeclaration
     extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, HasLabelAndAccessKey, HasImage,
-    IsDisabled, IsDefaultCommand, HasTip,
-    HasMarkup, HasCurrentMarkup, HasTabIndex, IsGridLayoutComponent, HasStyle {
+    IsDisabled, IsDefaultCommand, HasTip, HasMarkup, HasCurrentMarkup, HasTabIndex, HasStyle {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -29,7 +29,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIOutput;
 
@@ -41,11 +40,11 @@ import javax.faces.component.UIOutput;
     uiComponent = "org.apache.myfaces.tobago.component.UICalendar",
     uiComponentBaseClass = "javax.faces.component.UIOutput",
     uiComponentFacesClass = "javax.faces.component.UIOutput",
-    interfaces = "org.apache.myfaces.tobago.layout.LayoutComponent",
+    interfaces = "org.apache.myfaces.tobago.config.Configurable",
     componentFamily = UIOutput.COMPONENT_FAMILY,
     rendererType = RendererTypes.CALENDAR)
 public interface CalendarTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup {
 
   /**
    * The current value of this component.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,8 +32,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIColumn;
 
@@ -58,8 +56,7 @@ import javax.faces.component.UIColumn;
         "org.apache.myfaces.tobago.TreeCommand"
     })
 public interface ColumnNodeTagDeclaration
-    extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, IsGridLayoutContainer,
-    IsGridLayoutComponent, HasStyle, HasLabel {
+    extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, HasStyle, HasLabel {
 
   /**
    * Flag indicating whether or not the width of this column in a sheet is resizable, by the user.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasBinding;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
 
 import javax.faces.component.UIColumn;
@@ -42,5 +41,5 @@ import javax.faces.component.UIColumn;
     rendererType = RendererTypes.COLUMN_SELECTOR,
     allowedChildComponenents = "NONE")
 public interface ColumnSelectorTagDeclaration
-    extends IsDisabled, IsRendered, HasBinding, HasCurrentMarkup, IsGridLayoutContainer {
+    extends IsDisabled, IsRendered, HasBinding, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -1,7 +1,7 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
+ * distributed withA this work for additional information
  * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIColumn;
 
@@ -51,7 +50,7 @@ import javax.faces.component.UIColumn;
             allowedChildComponenents = "org.apache.myfaces.tobago.Menu")
     })
 public interface ColumnTagDeclaration
-    extends HasIdBindingAndRendered, HasLabel, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutContainer {
+    extends HasIdBindingAndRendered, HasLabel, HasTip, HasMarkup, HasCurrentMarkup {
   /**
    * Alignment of this column.
    */
@@ -80,7 +79,9 @@ public interface ColumnTagDeclaration
    * Allowd layout tokens ('*', '&lt;x>*', '&lt;x>px' or '&lt;x>%').
    * Where '*' is equivalent to '1*'.
    */
+/* TBD
   @TagAttribute
   @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
   void setWidth(String width);
+*/
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -33,7 +33,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -53,7 +52,7 @@ import javax.faces.component.UICommand;
             description = "Contains a UIPopup instance.",
             allowedChildComponenents = "org.apache.myfaces.tobago.Popup")})
 public interface CommandTagDeclaration
-    extends AbstractCommandTagDeclaration, HasId, HasValue, IsDisabled, IsGridLayoutComponent, HasStyle, HasMarkup,
+    extends AbstractCommandTagDeclaration, HasId, HasValue, IsDisabled, HasStyle, HasMarkup,
     HasCurrentMarkup, HasLabelAndAccessKey, HasTip {
 
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ExtensionPanelDeclaration.java Fri Sep 18 09:02:27 2015
@@ -25,8 +25,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -40,7 +38,6 @@ import javax.faces.component.UIPanel;
     uiComponentFacesClass = "javax.faces.component.UIPanel",
     componentFamily = UIPanel.COMPONENT_FAMILY,
     rendererType = RendererTypes.PANEL)
-public interface ExtensionPanelDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent,
-        IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
+public interface ExtensionPanelDeclaration extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip {
 
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -40,7 +40,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
 
@@ -66,7 +65,7 @@ import javax.faces.component.UIInput;
 public interface FileTagDeclaration
     extends HasValidator, HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
     HasValueChangeListener, HasIdBindingAndRendered, IsDisabled, HasMarkup, HasCurrentMarkup, IsFocus,
-    HasLabel, HasLabelLayout, HasTip, IsReadonly, IsRequired, HasTabIndex, IsGridLayoutComponent, HasStyle {
+    HasLabel, HasLabelLayout, HasTip, IsReadonly, IsRequired, HasTabIndex, HasStyle {
 
   /**
    * Value binding expression pointing to a

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.intern
 import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 
 import javax.el.ValueExpression;
 
@@ -45,143 +44,205 @@ public interface GridLayoutConstraintTag
   @TagAttribute(name = "rowSpan", type = "java.lang.Integer")
   void setRowSpan(final ValueExpression rowSpan);
 
-  /**
+/*
+*
    * The width for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "width", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setWidth(final ValueExpression width);
 
-  /**
+*
    * The height for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "height", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setHeight(final ValueExpression height);
 
-  /**
+*
    * The minimum width for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "minimumWidth", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMinimumWidth(final ValueExpression minimumWidth);
 
-  /**
+*
    * The minimum height for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "minimumHeight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMinimumHeight(final ValueExpression minimumHeight);
 
-  /**
+*
    * The preferred width for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "preferredWidth", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPreferredWidth(final ValueExpression preferredWidth);
 
-  /**
+*
    * The preferred height for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "preferredHeight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPreferredHeight(final ValueExpression preferredHeight);
 
-  /**
+*
    * The maximum width for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "maximumWidth", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMaximumWidth(final ValueExpression maximumWidth);
 
-  /**
+*
    * The maximum height for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "maximumHeight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMaximumHeight(final ValueExpression maximumHeight);
 
-  /**
+*
    * The left margin for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "marginLeft", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMarginLeft(final ValueExpression marginLeft);
 
-  /**
+*
    * The right margin for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "marginRight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMarginRight(final ValueExpression marginRight);
 
-  /**
+*
    * The top margin for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "marginTop", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMarginTop(final ValueExpression marginTop);
 
-  /**
+*
    * The bottom margin for this component.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "marginBottom", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setMarginBottom(final ValueExpression marginBottom);
 
-  /**
+*
    * The left border area for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "borderLeft", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setBorderLeft(final ValueExpression borderLeft);
 
-  /**
+*
    * The right border area for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "borderRight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setBorderRight(final ValueExpression borderRight);
 
-  /**
+*
    * The top border area for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "borderTop", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setBorderTop(final ValueExpression borderTop);
 
-  /**
+*
    * The bottom border area for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "borderBottom", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setBorderBottom(final ValueExpression borderBottom);
 
-  /**
+*
    * The left padding for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "paddingLeft", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPaddingLeft(final ValueExpression paddingLeft);
 
-  /**
+*
    * The right padding for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "paddingRight", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPaddingRight(final ValueExpression paddingRight);
 
-  /**
+*
    * The top padding for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "paddingTop", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPaddingTop(final ValueExpression paddingTop);
 
-  /**
+*
    * The bottom padding for this component. Its only applicably for containers.
-   */
+   * @deprecated since 3.0.0. Use &lt;tc:style> instead.
+
+
+  @Deprecated
   @TagAttribute(name = "paddingBottom", type = "java.lang.Object")
   @UIComponentTagAttribute(type = "java.lang.Object")
   void setPaddingBottom(final ValueExpression paddingBottom);
+*/
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -31,8 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIGraphic;
 
@@ -48,8 +46,7 @@ import javax.faces.component.UIGraphic;
     rendererType = RendererTypes.IMAGE,
     allowedChildComponenents = "NONE")
 public interface ImageTagDeclaration
-    extends HasIdBindingAndRendered, HasBorder, HasTip, IsDisabled, HasMarkup, HasCurrentMarkup,
-    IsGridLayoutComponentWithDimension, HasStyle, IsGridLayoutContainer {
+    extends HasIdBindingAndRendered, HasBorder, HasTip, IsDisabled, HasMarkup, HasCurrentMarkup, HasStyle {
 
   /**
    * Absolute url to an image or image name to lookup in tobago resource path.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIOutput;
 
@@ -48,7 +47,7 @@ import javax.faces.component.UIOutput;
     rendererType = RendererTypes.LABEL,
     allowedChildComponenents = "NONE")
 public interface LabelTagDeclaration extends HasIdBindingAndRendered,
-    HasAccessKey, HasFor, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent, HasStyle {
+    HasAccessKey, HasFor, HasTip, HasMarkup, HasCurrentMarkup, HasStyle {
 
   /**
    * Text value to display as label. Overwritten by 'labelWithAccessKey'

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -36,7 +36,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -64,5 +63,5 @@ import javax.faces.component.UICommand;
             allowedChildComponenents = "org.apache.myfaces.tobago.Popup")})
 public interface LinkTagDeclaration extends AbstractCommandTagDeclaration,
     HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled,
-    HasTip, HasImage, HasMarkup, HasCurrentMarkup, HasTabIndex, IsGridLayoutComponent, HasStyle {
+    HasTip, HasImage, HasMarkup, HasCurrentMarkup, HasTabIndex, HasStyle {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -28,8 +28,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -46,8 +44,7 @@ import javax.faces.component.UIPanel;
     rendererType = RendererTypes.MEDIATOR,
     interfaces = {"org.apache.myfaces.tobago.component.SupportsMarkup"})
 public interface MediatorTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup,
-    HasCurrentMarkup {
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup {
 
   /**
    * Name of a request-scope attribute under which this component is accessible.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -27,7 +27,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIPanel;
 
@@ -58,5 +57,5 @@ import javax.faces.component.UIPanel;
         "org.apache.myfaces.tobago.MenuSeparator"
         })
 public interface MenuBarTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -48,6 +47,6 @@ import javax.faces.component.UICommand;
     rendererType = RendererTypes.MENU_COMMAND,
     allowedChildComponenents = "NONE")
 public interface MenuCommandTagDeclaration
-    extends AbstractCommandTagDeclaration, IsGridLayoutComponent, HasStyle,
+    extends AbstractCommandTagDeclaration, HasStyle,
     HasIdBindingAndRendered, HasLabelAndAccessKey, HasTip, IsDisabled, HasImage, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIPanel;
 
@@ -58,5 +57,5 @@ import javax.faces.component.UIPanel;
         "org.apache.myfaces.tobago.MenuSelectOne",
         "org.apache.myfaces.tobago.MenuSeparator"})
 public interface MenuTagDeclaration extends HasIdBindingAndRendered, HasLabelAndAccessKey,
-    IsDisabled, HasImage, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    IsDisabled, HasImage, HasStyle, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -29,7 +29,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.layout.OrderBy;
 
 import javax.faces.component.UIMessages;
@@ -47,7 +46,7 @@ import javax.faces.component.UIMessages;
     allowedChildComponenents = "NONE")
 
 public interface MessagesTagDeclaration
-    extends HasIdBindingAndRendered, HasFor, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    extends HasIdBindingAndRendered, HasFor, HasStyle, HasMarkup, HasCurrentMarkup {
 
   /**
    * Flag indicating that only messages that are not associated to any

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -28,7 +28,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIOutput;
 
@@ -44,8 +43,7 @@ import javax.faces.component.UIOutput;
     componentFamily = UIOutput.COMPONENT_FAMILY,
     rendererType = RendererTypes.OBJECT,
     allowedChildComponenents = "NONE")
-public interface ObjectTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasMarkup,
-    HasCurrentMarkup {
+public interface ObjectTagDeclaration extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup {
 
   /**
    * URI to object source

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -35,7 +35,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIOutput;
 
@@ -53,7 +52,7 @@ import javax.faces.component.UIOutput;
     allowedChildComponenents = "NONE")
 
 public interface OutTagDeclaration
-    extends HasIdBindingAndRendered, HasConverter, HasTip, HasValue, IsGridLayoutComponent, HasStyle,
+    extends HasIdBindingAndRendered, HasConverter, HasTip, HasValue, HasStyle,
     HasMarkup, HasCurrentMarkup, HasSanitize, HasLabel, HasLabelLayout {
 
   /**

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -19,7 +19,6 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
 import org.apache.myfaces.tobago.apt.annotation.Facet;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -33,8 +32,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIForm;
 
@@ -58,12 +55,11 @@ import javax.faces.component.UIForm;
                 allowedChildComponenents = {"org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.Form"}),
           @Facet(name = Facets.MENUBAR, description = "Menubar",
                 allowedChildComponenents = "javax.faces.component.UIPanel"), //fake
-          @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
-                allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
+          @Facet(name=Facets.LAYOUT, description = "Deprecated. Contains an layout manager. "
+              + "The layout manager tag should surround the content instead.")})
 
 public interface PageTagDeclaration
-    extends HasLabel, HasId, HasBinding, HasMarkup, HasCurrentMarkup,
-    IsGridLayoutComponentWithDimension, HasStyle, IsGridLayoutContainer {
+    extends HasLabel, HasId, HasBinding, HasMarkup, HasCurrentMarkup, HasStyle {
 
   /**
    * Contains the id of the component which should have the focus after
@@ -82,27 +78,4 @@ public interface PageTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute()
   void setApplicationIcon(String icon);
-
-  /**
-   * <strong>ValueBindingExpression</strong> pointing to a object to save the
-   * component's state.
-   * @deprecated since Tobago 1.5.0. Please set the min/max values with e. g. 
-   * a tc:gridLayoutConstraint tag.
-   */
-  @Deprecated
-  @TagAttribute
-  @UIComponentTagAttribute(
-      type = "java.lang.Object", expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
-  void setState(String state);
-
-  // XXX LAYOUT_GENERATE
-//  @TagAttribute
-//  @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
-//  void setHeight(String height);
-
-  // XXX LAYOUT_GENERATE
-//  @TagAttribute
-//  @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
-//  void setWidth(String width);
-
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -29,8 +29,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -47,11 +45,10 @@ import javax.faces.component.UIPanel;
     rendererType = RendererTypes.PANEL,
     interfaces = "org.apache.myfaces.tobago.component.SupportsMarkup",
     facets = {
-    @Facet(name= Facets.RELOAD, description = "Contains an instance of UIReload",
+        @Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
             allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
-    @Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
-            allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
-public interface PanelTagDeclaration 
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer,
-    HasMarkup, HasCurrentMarkup, HasTip {
+        @Facet(name = Facets.LAYOUT, description = "Deprecated. Contains an layout manager. "
+            + "The layout manager tag should surround the content instead.")})
+public interface PanelTagDeclaration
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup, HasTip {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -30,8 +30,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponentWithDimension;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -49,13 +47,11 @@ import javax.faces.component.UIPanel;
     componentFamily = UIPanel.COMPONENT_FAMILY,
     rendererType = RendererTypes.POPUP,
     facets = {
-        @Facet(name = Facets.LAYOUT,
-            description = "Contains an instance of AbstractUILayoutBase",
-            allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")}
+        @Facet(name = Facets.LAYOUT, description = "Deprecated. Contains an layout manager. "
+            + "The layout manager tag should surround the content instead.")}
 )
-public interface PopupTagDeclaration 
-    extends HasIdBindingAndRendered, IsGridLayoutComponentWithDimension, HasStyle, IsGridLayoutContainer,
-    HasMarkup, HasCurrentMarkup {
+public interface PopupTagDeclaration
+    extends HasIdBindingAndRendered, HasStyle, HasMarkup, HasCurrentMarkup {
 
   /**
    * The rest of the page will be faded off for the time the popup is displayed.
@@ -65,5 +61,5 @@ public interface PopupTagDeclaration
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
   void setModal(String modal);
-  
+
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIOutput;
 
@@ -54,7 +53,7 @@ import javax.faces.component.UIOutput;
         allowedChildComponenents = "org.apache.myfaces.tobago.Command")})
         
 public interface ProgressTagDeclaration
-    extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent, HasStyle {
+    extends HasIdBindingAndRendered, HasTip, HasMarkup, HasCurrentMarkup, HasStyle {
 
   /**
    * The current value of this component.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 /**
  * Renders a section or subsection.
@@ -48,6 +47,6 @@ import org.apache.myfaces.tobago.interna
             allowedChildComponenents = "org.apache.myfaces.tobago.Label")})
 
 public interface SectionTagDeclaration
-    extends HasIdBindingAndRendered, HasLabel, IsGridLayoutComponent, HasStyle, HasImage,
+    extends HasIdBindingAndRendered, HasLabel, HasStyle, HasImage,
     HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -42,7 +42,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
 
@@ -76,6 +75,5 @@ public interface SelectBooleanCheckboxTa
     HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
     HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
     IsRequiredForSelect, HasConverter, IsFocus,
-    HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage,
-    IsGridLayoutComponent, HasStyle, HasItemLabel {
+    HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, HasStyle, HasItemLabel {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCommandTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -28,7 +28,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
@@ -36,5 +35,5 @@ import org.apache.myfaces.tobago.interna
     uiComponentFacesClass = "javax.faces.component.UICommand")
 public interface SelectBooleanCommandTagDeclaration
     extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, HasValue, HasLabelAndAccessKey, HasTip,
-    IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    HasStyle, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -43,7 +43,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsInline;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
@@ -69,8 +68,7 @@ public interface SelectManyCheckboxTagDe
     IsDisabled, HasId, HasTip, IsInline, HasRenderRange, IsRendered, IsRequiredForSelect,
     HasBinding, IsReadonly, HasConverter, HasLabelLayout,
     HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasValueChangeListener,
-    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent,
-    HasStyle {
+    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, HasStyle {
 
   /**
    * The value of the multi select.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -41,7 +41,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
@@ -64,8 +63,7 @@ public interface SelectManyListboxTagDec
     extends HasId, IsDisabled, IsRendered, HasBinding, HasTip,
     IsReadonly, HasConverter, IsRequiredForSelect, HasMarkup, HasCurrentMarkup,
     HasLabel, HasValidator, HasValueChangeListener, HasLabelLayout,
-    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent,
-    HasStyle {
+    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, HasStyle {
 
   /**
    * The value of the multi select.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -42,7 +42,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
@@ -63,8 +62,7 @@ import javax.faces.component.UISelectMan
 public interface SelectManyShuttleTagDeclaration extends
     IsDisabled, HasId, HasTip, IsRendered, IsRequiredForSelect, HasBinding, IsReadonly, HasConverter,
     HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasValueChangeListener, HasLabelLayout,
-    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent,
-    HasStyle {
+    HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, HasStyle {
 
   /**
    * The value of the multi select.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -29,7 +29,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 /**
  * Renders a separator.
@@ -48,5 +47,5 @@ import org.apache.myfaces.tobago.interna
             allowedChildComponenents = "org.apache.myfaces.tobago.Label")})
 
 public interface SeparatorTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasLabel, HasMarkup, HasCurrentMarkup {
+    extends HasIdBindingAndRendered, HasStyle, HasLabel, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -34,8 +34,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasRenderedPartially;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasVar;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRoot;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRootJunction;
 
@@ -59,7 +57,7 @@ import javax.faces.component.UIData;
     facets = {@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
                      allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
 public interface SheetTagDeclaration 
-    extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer,
+    extends HasIdBindingAndRendered, HasStyle,
     HasMarkup, HasCurrentMarkup, HasRenderedPartially, IsShowRoot, IsShowRootJunction, HasVar {
   /**
    * LayoutConstraints for column layout.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -34,8 +34,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasRenderedPartially;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsImmediateCommand;
 
 import javax.faces.component.UIPanel;
@@ -56,7 +54,7 @@ import javax.faces.component.UIPanel;
 
 public interface TabGroupTagDeclaration
     extends HasIdBindingAndRendered, IsImmediateCommand, HasAction, HasActionListener, HasMarkup, HasCurrentMarkup,
-    IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasRenderedPartially {
+    HasStyle, HasRenderedPartially {
 
   /**
    * Flag indicating that the tab navigation bar is rendered.

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,8 +32,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutContainer;
 
 import javax.faces.component.UIPanel;
 
@@ -55,6 +53,6 @@ import javax.faces.component.UIPanel;
         @Facet(name = Facets.TOOL_BAR, description = "Contains an instance of UIToolBar",
             allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar")})
 public interface TabTagDeclaration
-    extends HasIdBindingAndRendered, IsGridLayoutContainer, IsGridLayoutComponent, HasStyle,
-    HasLabelAndAccessKey, HasTip, HasMarkup, HasCurrentMarkup, IsDisabled, HasImage {
+    extends HasIdBindingAndRendered, HasStyle, HasLabelAndAccessKey, HasTip, HasMarkup, HasCurrentMarkup, IsDisabled,
+    HasImage {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -34,7 +34,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -59,5 +58,5 @@ import javax.faces.component.UICommand;
     })
 public interface ToolBarCommandTagDeclaration
     extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup,
-    HasLabelAndAccessKey, HasImage, IsDisabled, HasTip, IsGridLayoutComponent, HasStyle {
+    HasLabelAndAccessKey, HasImage, IsDisabled, HasTip, HasStyle {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -50,5 +49,5 @@ import javax.faces.component.UICommand;
     allowedChildComponenents = "NONE")
 public interface ToolBarSelectBooleanTagDeclaration
     extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, HasLabelAndAccessKey,
-    HasImage, IsDisabled, HasValue, HasTip, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    HasImage, IsDisabled, HasValue, HasTip, HasStyle, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -47,5 +46,5 @@ import javax.faces.component.UICommand;
     rendererType = RendererTypes.MENU_COMMAND,
     allowedChildComponenents = "NONE")
 public interface ToolBarSelectOneTagDeclaration extends AbstractCommandTagDeclaration, HasLabelAndAccessKey, HasTip,
-    HasIdBindingAndRendered, IsDisabled, HasValue, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup {
+    HasIdBindingAndRendered, IsDisabled, HasValue, HasStyle, HasMarkup, HasCurrentMarkup {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -35,7 +35,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UICommand;
 
@@ -49,7 +48,7 @@ import javax.faces.component.UICommand;
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITreeCommand",
     uiComponentFacesClass = "javax.faces.component.UICommand",
     interfaces = {
-        "org.apache.myfaces.tobago.layout.LayoutBase",
+        "org.apache.myfaces.tobago.config.Configurable",
         "org.apache.myfaces.tobago.component.SupportsAccessKey"
     },
     componentFamily = UICommand.COMPONENT_FAMILY,
@@ -66,5 +65,5 @@ import javax.faces.component.UICommand;
     rendererType = RendererTypes.TREE_COMMAND)
 public interface TreeCommandTagDeclaration
     extends AbstractCommandTagDeclaration, HasIdBindingAndRendered, IsDisabled,
-    HasLabelAndAccessKey, HasTip, HasMarkup, HasCurrentMarkup, HasTabIndex, IsGridLayoutComponent, HasStyle {
+    HasLabelAndAccessKey, HasTip, HasMarkup, HasCurrentMarkup, HasTabIndex, HasStyle {
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java?rev=1703781&r1=1703780&r2=1703781&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java Fri Sep 18 09:02:27 2015
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasStyle;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
 import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
 
 import javax.faces.component.UIGraphic;
 
@@ -46,7 +45,7 @@ import javax.faces.component.UIGraphic;
     rendererType = RendererTypes.TREE_ICON,
     allowedChildComponenents = "NONE")
 public interface TreeIconTagDeclaration
-    extends HasIdBindingAndRendered, HasTip, IsDisabled, HasMarkup, HasCurrentMarkup, IsGridLayoutComponent, HasStyle {
+    extends HasIdBindingAndRendered, HasTip, IsDisabled, HasMarkup, HasCurrentMarkup, HasStyle {
 
   /**
    * Absolute url to an image or image name to lookup in tobago resource path