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/04/08 16:21:04 UTC

svn commit: r1672093 [1/2] - in /myfaces/tobago/trunk: ./ src/docbook/ tobago-example/tobago-example-addressbook-cdi/src/main/webapp/ tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/ tobago-example/tobago-example-addressbook-c...

Author: lofwyr
Date: Wed Apr  8 14:21:03 2015
New Revision: 1672093

URL: http://svn.apache.org/r1672093
Log:
Merge from tobago-3.0.x

Removed:
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/span.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/span2.jsp
Modified:
    myfaces/tobago/trunk/   (props changed)
    myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/admin/admin.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/editor.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/layout/basic.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/list.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/start.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/business.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/personal.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/error.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/login.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/logout.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/error.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/   (props changed)
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/   (props changed)
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/fileUpload.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/menu.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/messages.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup2.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/renderedPartially.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/selectOneChoice.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarDetail.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarList2.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/hello.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/index.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/inputSlider.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/navigation.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/selectManyShuttle.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/admin.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/index.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/error.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/login.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/public.jsp
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/3x3-center.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/position-4x4-span-steps.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/subview.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/gridLayout/nested-v.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/hidden/hidden.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/image/disabled.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/id-and-fieldId.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/label/label.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/resource/tobago-694.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/selectItem/type-of-literals.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/selectOneChoice/currency.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/type/measure-image-with-constraints.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/type/measure-image-without-constraints.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tf/wizard/navi/fileIntoCondition.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tf/wizard/navi/filter.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tf/wizard/navi/finish.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tf/wizard/navi/forwardCondition.xhtml

Propchange: myfaces/tobago/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  8 14:21:03 2015
@@ -1,3 +1,3 @@
 /myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
-/myfaces/tobago/branches/tobago-3.0.x:1646189,1646226,1650101,1660635
+/myfaces/tobago/branches/tobago-3.0.x:1646189,1646226,1650101,1660635,1672073
 /myfaces/tobago/branches/tobago-tree-table:1226794-1341423

Modified: myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml Wed Apr  8 14:21:03 2015
@@ -601,7 +601,7 @@
           <f:facet name="layout">
             <tc:gridLayout columns="*;fixed;fixed"/>
           </f:facet>
-          <tc:cell/>
+          <tc:panel/>
           <tc:button label="OK">
             <emphasis role="bold">&lt;tc:attribute name="popupClose" value="afterSubmit"/&gt;</emphasis>
           &lt;/tc:button&gt;

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/admin/admin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/admin/admin.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/admin/admin.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/admin/admin.xhtml Wed Apr  8 14:21:03 2015
@@ -38,7 +38,7 @@
       <f:facet name="layout">
         <tc:gridLayout columns="*;auto"/>
       </f:facet>
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="Back" action="list"/>
     </tc:panel>
   </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/editor.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/editor.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/editor.xhtml Wed Apr  8 14:21:03 2015
@@ -55,7 +55,7 @@
           <tc:gridLayout columns="3*;1*;1*"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button action="#{controller.store}"
                    label="#{bundle.editorStore}" defaultCommand="true"/>
         <tc:button action="#{controller.cancel}" immediate="true"

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/layout/basic.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/layout/basic.xhtml Wed Apr  8 14:21:03 2015
@@ -88,24 +88,27 @@
               </f:facet>
 
               <tc:out markup="strong" value="Addressbook Demo"/>
-              <tc:cell/>
+              <tc:panel/>
               <tc:out value="Version #{controller.version}"/>
-              <tc:cell/>
+              <tc:panel/>
             </tc:panel>
 
-            <tc:cell spanX="2"/>
+            <tc:panel>
+              <tc:gridLayoutConstraint columnSpan="2"/>
+            </tc:panel>
 
-            <tc:cell spanX="2">
+            <tc:panel>
+              <tc:gridLayoutConstraint columnSpan="2"/>
               <tc:panel>
                 <f:facet name="layout">
                   <tc:gridLayout columns="*;auto"/>
                 </f:facet>
-                <tc:cell/>
+                <tc:panel/>
                 <tc:button label="OK">
                   <tc:attribute name="popupClose" value="immediate"/>
                 </tc:button>
               </tc:panel>
-            </tc:cell>
+            </tc:panel>
           </tc:box>
         </tc:popup>
       </f:facet>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/list.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/list.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/list.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/list.xhtml Wed Apr  8 14:21:03 2015
@@ -81,12 +81,12 @@
                   <tc:selectBooleanCheckbox label="First Name" value="#{controller.renderFirstName}"/>
                   <tc:selectBooleanCheckbox label="Last Name" value="#{controller.renderLastName}"/>
                   <tc:selectBooleanCheckbox label="Birthday" value="#{controller.renderDayOfBirth}"/>
-                  <tc:cell/>
+                  <tc:panel/>
                   <tc:panel>
                     <f:facet name="layout">
                       <tc:gridLayout columns="1*;100px;100px"/>
                     </f:facet>
-                    <tc:cell/>
+                    <tc:panel/>
                     <tc:button action="#{controller.cancelPopup}" label="OK" defaultCommand="true"/>
                     <tc:button action="#{controller.cancelPopup}" label="Cancel" immediate="true"/>
                   </tc:panel>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/start.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/start.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/start.xhtml Wed Apr  8 14:21:03 2015
@@ -34,9 +34,11 @@
         <tc:gridLayout margin="10px" rows="*;auto;*" columns="*;400px;*"/>
       </f:facet>
 
-      <tc:cell spanX="3"/>
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout rows="150px" columns="150px;250px"/>
@@ -50,16 +52,18 @@
           </f:facet>
 
           <tc:out value="Addressbook Demo"/>
-          <tc:cell/>
+          <tc:panel/>
           <tc:out value="Initializing ..."/>
-          <tc:cell/>
+          <tc:panel/>
 
         </tc:panel>
 
       </tc:panel>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell spanX="3"/>
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
     </tc:panel>
   </tc:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/business.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/business.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/business.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/business.xhtml Wed Apr  8 14:21:03 2015
@@ -44,7 +44,7 @@
     <tx:in value="#{controller.currentAddress.jobHomePage}"
            label="#{bundle.editorHomepage}"/>
 
-    <tc:cell/>
+    <tc:panel/>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/personal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/personal.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/personal.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/addressbook/tab/personal.xhtml Wed Apr  8 14:21:03 2015
@@ -66,7 +66,7 @@
             label="#{bundle.editorCountry}">
           <f:selectItems value="#{countries}"/>
         </tx:selectOneChoice>
-        <tc:cell/>
+        <tc:panel/>
       </tc:panel>
       <tc:panel rendered="#{!controller.simple}">
         <f:facet name="layout">
@@ -92,7 +92,7 @@
                     <f:facet name="layout">
                       <tc:gridLayout columns="1*;100px;100px"/>
                     </f:facet>
-                    <tc:cell/>
+                    <tc:panel/>
                     <tc:button action="#{controller.okFileUpload}" label="OK"/>
                     <tc:button action="#{controller.cancelFileUpload}" label="Cancel" immediate="true"/>
                   </tc:panel>
@@ -137,7 +137,7 @@
       </tx:date>
     </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/error.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/error.xhtml Wed Apr  8 14:21:03 2015
@@ -30,9 +30,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="Login Error">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -45,13 +47,15 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="Home"/>
       </tc:panel>
 
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/login.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/login.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/login.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/login.xhtml Wed Apr  8 14:21:03 2015
@@ -31,9 +31,11 @@
 
     <tc:script file="auth/login.js"/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="#{test.test}">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto;auto;auto"/>
@@ -49,7 +51,7 @@
           <tc:dataAttribute name="login" value='{"username": "guest", "password": "guest"}'/>
         </tc:link>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:link label="admin/admin" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
                  omit="true">
           <tc:dataAttribute name="login" value='{"username": "admin", "password": "admin"}'/>
@@ -64,13 +66,16 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button label="#{bundle.loginLogin}" defaultCommand="true"/>
       </tc:panel>
     </tc:box>
 
-    <tc:cell/>
-    <tc:cell spanX="3"/>
+    <tc:panel/>
+
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/logout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/logout.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/logout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/auth/logout.xhtml Wed Apr  8 14:21:03 2015
@@ -29,9 +29,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="#{bundle.loginLogoutBox}">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -43,13 +45,15 @@
         <f:facet name="layout">
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="#{bundle.loginHomeButton}"/>
       </tc:panel>
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/error.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/error.xhtml Wed Apr  8 14:21:03 2015
@@ -28,9 +28,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="Error">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -43,13 +45,16 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="Home"/>
       </tc:panel>
 
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
+
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell spanX="3"/>
   </tc:page>
 </f:view>

Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  8 14:21:03 2015
@@ -1,2 +1,3 @@
+/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp:1672073
 /myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp:1226794-1341423
 /myfaces/tobago/trunk/example/addressbook/src/main/webapp:699460,699891-700092,743495-743708,744771-744909,744926

Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  8 14:21:03 2015
@@ -0,0 +1 @@
+/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook:1672073

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/admin.xhtml Wed Apr  8 14:21:03 2015
@@ -39,7 +39,7 @@
       <f:facet name="layout">
         <tc:gridLayout columns="*;auto"/>
       </f:facet>
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="Back" action="list"/>
     </tc:panel>
   </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/admin/logging.xhtml Wed Apr  8 14:21:03 2015
@@ -75,7 +75,7 @@
         <f:facet name="layout">
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
-        <tc:cell/>
+        <tc:panel/>
         <tc:button label="Update" action="#{logging.updateCategories}"/>
       </tc:panel>
     </tc:box>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml Wed Apr  8 14:21:03 2015
@@ -55,7 +55,7 @@
           <tc:gridLayout columns="3*;1*;1*"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button action="#{controller.store}"
                    label="#{bundle.editorStore}" defaultCommand="true"/>
         <tc:button action="#{controller.cancel}" immediate="true"

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Wed Apr  8 14:21:03 2015
@@ -88,24 +88,27 @@
               </f:facet>
 
               <tc:out markup="strong" value="Addressbook Demo"/>
-              <tc:cell/>
+              <tc:panel/>
               <tc:out value="Version #{controller.version}"/>
-              <tc:cell/>
+              <tc:panel/>
             </tc:panel>
 
-            <tc:cell spanX="2"/>
+            <tc:panel>
+              <tc:gridLayoutConstraint columnSpan="2"/>
+            </tc:panel>
 
-            <tc:cell spanX="2">
+            <tc:panel>
+              <tc:gridLayoutConstraint columnSpan="2"/>
               <tc:panel>
                 <f:facet name="layout">
                   <tc:gridLayout columns="*;auto"/>
                 </f:facet>
-                <tc:cell/>
+                <tc:panel/>
                 <tc:button label="OK">
                   <tc:attribute name="popupClose" value="immediate"/>
                 </tc:button>
               </tc:panel>
-            </tc:cell>
+            </tc:panel>
           </tc:box>
         </tc:popup>
       </f:facet>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml Wed Apr  8 14:21:03 2015
@@ -81,12 +81,12 @@
                   <tc:selectBooleanCheckbox label="First Name" value="#{controller.renderFirstName}"/>
                   <tc:selectBooleanCheckbox label="Last Name" value="#{controller.renderLastName}"/>
                   <tc:selectBooleanCheckbox label="Birthday" value="#{controller.renderDayOfBirth}"/>
-                  <tc:cell/>
+                  <tc:panel/>
                   <tc:panel>
                     <f:facet name="layout">
                       <tc:gridLayout columns="1*;100px;100px"/>
                     </f:facet>
-                    <tc:cell/>
+                    <tc:panel/>
                     <tc:button action="#{controller.cancelPopup}" label="OK" defaultCommand="true"/>
                     <tc:button action="#{controller.cancelPopup}" label="Cancel" immediate="true"/>
                   </tc:panel>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/start.xhtml Wed Apr  8 14:21:03 2015
@@ -34,9 +34,11 @@
         <tc:gridLayout margin="10px" rows="*;auto;*" columns="*;400px;*"/>
       </f:facet>
 
-      <tc:cell spanX="3"/>
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout rows="150px" columns="150px;250px"/>
@@ -50,16 +52,18 @@
           </f:facet>
 
           <tc:out value="Addressbook Demo"/>
-          <tc:cell/>
+          <tc:panel/>
           <tc:out value="Initializing ..."/>
-          <tc:cell/>
+          <tc:panel/>
 
         </tc:panel>
 
       </tc:panel>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell spanX="3"/>
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
     </tc:panel>
   </tc:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/business.xhtml Wed Apr  8 14:21:03 2015
@@ -44,7 +44,7 @@
     <tx:in value="#{controller.currentAddress.jobHomePage}"
            label="#{bundle.editorHomepage}"/>
 
-    <tc:cell/>
+    <tc:panel/>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml Wed Apr  8 14:21:03 2015
@@ -66,7 +66,7 @@
             label="#{bundle.editorCountry}">
           <f:selectItems value="#{countries}"/>
         </tx:selectOneChoice>
-        <tc:cell/>
+        <tc:panel/>
       </tc:panel>
       <tc:panel rendered="#{!controller.simple}">
         <f:facet name="layout">
@@ -92,7 +92,7 @@
                     <f:facet name="layout">
                       <tc:gridLayout columns="1*;100px;100px"/>
                     </f:facet>
-                    <tc:cell/>
+                    <tc:panel/>
                     <tc:button action="#{controller.okFileUpload}" label="OK"/>
                     <tc:button action="#{controller.cancelFileUpload}" label="Cancel" immediate="true"/>
                   </tc:panel>
@@ -137,7 +137,7 @@
       </tx:date>
     </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/error.xhtml Wed Apr  8 14:21:03 2015
@@ -29,9 +29,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="Login Error">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -44,13 +46,15 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="Home"/>
       </tc:panel>
 
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml Wed Apr  8 14:21:03 2015
@@ -30,9 +30,11 @@
 
     <tc:script file="auth/login.js"/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="Login">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto;auto;auto"/>
@@ -48,7 +50,7 @@
           <tc:dataAttribute name="login" value='{"username": "guest", "password": "guest"}'/>
         </tc:link>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:link label="admin/admin" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
                  omit="true">
           <tc:dataAttribute name="login" value='{"username": "admin", "password": "admin"}'/>
@@ -63,13 +65,16 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button label="#{bundle.loginLogin}" defaultCommand="true"/>
       </tc:panel>
     </tc:box>
 
-    <tc:cell/>
-    <tc:cell spanX="3"/>
+    <tc:panel/>
+
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/auth/logout.xhtml Wed Apr  8 14:21:03 2015
@@ -29,9 +29,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="#{bundle.loginLogoutBox}">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -43,13 +45,15 @@
         <f:facet name="layout">
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="#{bundle.loginHomeButton}"/>
       </tc:panel>
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/error.xhtml Wed Apr  8 14:21:03 2015
@@ -28,9 +28,11 @@
       <tc:gridLayout rows="*;auto;*" columns="*;400px;*"/>
     </f:facet>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:box label="Error">
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto"/>
@@ -43,13 +45,15 @@
           <tc:gridLayout columns="*;auto"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
         <tc:button link="/index.jsp" label="Home"/>
       </tc:panel>
 
     </tc:box>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Wed Apr  8 14:21:03 2015
@@ -63,13 +63,15 @@
       <tc:gridLayout border="0" columns="*;4*" margin="10px" rows="100px;auto;*;auto"/>
     </f:facet>
 
-    <tc:cell spanX="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
       <jsp:include page="/header.jsp"/>
-    </tc:cell>
+    </tc:panel>
 
-    <tc:cell spanY="3">
+    <tc:panel>
+      <tc:gridLayoutConstraint rowSpan="3"/>
       <jsp:include page="/navigation.jsp"/>
-    </tc:cell>
+    </tc:panel>
 
     <tc:messages/>
 
@@ -77,9 +79,9 @@
       <jsp:doBody/>
     </tc:box>
 
-    <tc:cell>
+    <tc:panel>
       <jsp:include page="/footer.jsp"/>
-    </tc:cell>
+    </tc:panel>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml Wed Apr  8 14:21:03 2015
@@ -38,13 +38,15 @@
         <tc:gridLayout border="0" columns="*;4*" margin="10px" rows="100px;auto;*;auto"/>
       </f:facet>
 
-      <tc:cell spanX="2">
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="2"/>
         <ui:include src="/header.xhtml"/>
-      </tc:cell>
+      </tc:panel>
 
-      <tc:cell spanY="3">
+      <tc:panel>
+        <tc:gridLayoutConstraint rowSpan="3"/>
         <ui:include src="/navigation.xhtml"/>
-      </tc:cell>
+      </tc:panel>
 
       <tc:messages/>
 
@@ -52,9 +54,9 @@
         <ui:insert/>
       </tc:box>
 
-      <tc:cell>
+      <tc:panel>
         <ui:include src="/footer.xhtml"/>
-      </tc:cell>
+      </tc:panel>
 
     </tc:page>
   </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml Wed Apr  8 14:21:03 2015
@@ -23,44 +23,45 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
-<tc:box label="Output Controls">
-      <f:facet name="layout">
-        <tc:gridLayout columns="*" rows="auto;auto;100px;auto;auto;90px;*" border="1"/>
-      </f:facet>
-
-      <!-- code-sniplet-start id="label" -->
-      <tc:label value="_Single Label"/>
-      <!-- code-sniplet-end id="label" -->
-      <tc:cell/>
-
-      <tx:out label="Phone Number" value="+1 234 567890">
-          <tc:gridLayoutConstraint columnSpan="2"/>
-      </tx:out>
-
-      <tc:cell spanX="2">
-        <!-- code-sniplet-start id="out" -->
-        <tc:out value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque consequat, libero eget porta mattis, risus velit congue magna, at posuere sem orci vitae turpis. Integer pulvinar. Cras libero. Proin vestibulum tempor urna. Nulla odio nisl, auctor vitae, faucibus pharetra, feugiat eget, justo. Suspendisse at tellus non justo dictum tincidunt. Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu et dolor auctor varius. Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo, id faucibus nunc orci sed purus. Proin ligula erat, sollicitudin id, rhoncus eget, nonummy sit amet, risus. Aenean arcu lorem, facilisis et, posuere sed, ultrices tincidunt, nunc. Sed ac massa. Quisque lacinia. Donec quis nibh.
+  <tc:box label="Output Controls">
+    <f:facet name="layout">
+      <tc:gridLayout columns="*" rows="auto;auto;100px;auto;auto;90px;*" border="1"/>
+    </f:facet>
+
+    <!-- code-sniplet-start id="label" -->
+    <tc:label value="_Single Label"/>
+    <!-- code-sniplet-end id="label" -->
+    <tc:panel/>
+
+    <tx:out label="Phone Number" value="+1 234 567890">
+      <tc:gridLayoutConstraint columnSpan="2"/>
+    </tx:out>
+
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
+      <!-- code-sniplet-start id="out" -->
+      <tc:out value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque consequat, libero eget porta mattis, risus velit congue magna, at posuere sem orci vitae turpis. Integer pulvinar. Cras libero. Proin vestibulum tempor urna. Nulla odio nisl, auctor vitae, faucibus pharetra, feugiat eget, justo. Suspendisse at tellus non justo dictum tincidunt. Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu et dolor auctor varius. Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo, id faucibus nunc orci sed purus. Proin ligula erat, sollicitudin id, rhoncus eget, nonummy sit amet, risus. Aenean arcu lorem, facilisis et, posuere sed, ultrices tincidunt, nunc. Sed ac massa. Quisque lacinia. Donec quis nibh.
 
           Aenean ac diam eget mi feugiat pulvinar. Etiam orci. Aliquam nec arcu nec eros ornare pulvinar. Sed nec velit. Ut ut orci. Nulla varius. Maecenas feugiat. Etiam varius ipsum et orci. Ut consectetuer odio sit amet libero. Nulla iaculis adipiscing purus. Maecenas a sed."/>
-        <!-- code-sniplet-end id="out" -->
-      </tc:cell>
+      <!-- code-sniplet-end id="out" -->
+    </tc:panel>
 
-      <!-- code-sniplet-start id="messages" -->
-      <tc:messages />
-      <!-- code-sniplet-end id="messages" -->
-      <tc:cell/>
-
-      <!--<tc:messages maxNumber="2"/>-->
-      <tc:cell/>
-      <tc:cell/>
-
-      <!-- code-sniplet-start id="image" -->
-      <tc:image value="image/tobago_head.gif" width="150" height="83"/>
-      <!-- code-sniplet-end id="image" -->
-      <tc:cell/>
+    <!-- code-sniplet-start id="messages" -->
+    <tc:messages/>
+    <!-- code-sniplet-end id="messages" -->
+    <tc:panel/>
+
+    <!--<tc:messages maxNumber="2"/>-->
+    <tc:panel/>
+    <tc:panel/>
+
+    <!-- code-sniplet-start id="image" -->
+    <tc:image value="image/tobago_head.gif" width="150" height="83"/>
+    <!-- code-sniplet-end id="image" -->
+    <tc:panel/>
 
-      <tc:cell/>
-      <tc:cell/>
+    <tc:panel/>
+    <tc:panel/>
 
-    </tc:box>
+  </tc:box>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml Wed Apr  8 14:21:03 2015
@@ -23,15 +23,17 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
-<tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="400px;*" rows="200px;*"/>
-      </f:facet>
-      <!-- code-sniplet-start id="box" -->
-      <tc:box label="Box Headline">
-      </tc:box>
-      <!-- code-sniplet-end id="box" -->
-      <tc:cell/>
-      <tc:cell spanX="2"/>
+  <tc:panel>
+    <f:facet name="layout">
+      <tc:gridLayout columns="400px;*" rows="200px;*"/>
+    </f:facet>
+    <!-- code-sniplet-start id="box" -->
+    <tc:box label="Box Headline">
+    </tc:box>
+    <!-- code-sniplet-end id="box" -->
+    <tc:panel/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
     </tc:panel>
+  </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml Wed Apr  8 14:21:03 2015
@@ -27,13 +27,14 @@
       <tc:gridLayout columns="1*;1*" rows="auto;*"/>
     </f:facet>
 
-    <tc:cell spanX="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
       <tc:separator>
         <f:facet name="label">
           <tc:label value="Separator with Label"/>
         </f:facet>
       </tc:separator>
-    </tc:cell>
+    </tc:panel>
 
     <tc:panel>
       <f:facet name="layout">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml Wed Apr  8 14:21:03 2015
@@ -35,21 +35,21 @@
       <f:convertDateTime pattern="dd.MM.yyyy"/>
     </tx:in>
     <!-- code-sniplet-end id="date" -->
-    <tc:cell/>
+    <tc:panel/>
 
     <!-- code-sniplet-start id="date" -->
     <tx:date label="Date" value="#{dateController.once}">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
     </tx:date>
     <!-- code-sniplet-end id="date" -->
-    <tc:cell/>
+    <tc:panel/>
 
     <!-- code-sniplet-start id="date" -->
     <tc:date value="#{dateController.once}">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
     </tc:date>
     <!-- code-sniplet-end id="date" -->
-    <tc:cell/>
+    <tc:panel/>
 
     <!-- code-sniplet-start id="dateTime" -->
 <!--
@@ -59,7 +59,7 @@
 -->
     <!-- code-sniplet-end id="dateTime" -->
 <!--
-    <tc:cell/>
+    <tc:panel/>
 -->
 
 <!--
@@ -68,74 +68,76 @@
     <tx:date label="Date (focus)">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Short style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="short" type="both" timeStyle="short"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Medium Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="medium" type="both" timeStyle="medium"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Long Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="long" type="both" timeStyle="long"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Full Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="full" type="both" timeStyle="full"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Month" value="#{dateController.once}">
       <f:convertDateTime pattern="MM/yyyy"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:date label="Year" value="#{dateController.once}">
       <f:convertDateTime pattern="yyyy"/>
     </tx:date>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time" value="#{dateController.once}">
       <f:convertDateTime type="time" pattern="HH:mm"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time (Seconds)" value="#{dateController.once}">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time" value="#{dateController.once}" readonly="true">
       <f:convertDateTime type="time" pattern="HH:mm"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time (Seconds)" value="#{dateController.once}" readonly="true">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time" value="#{dateController.once}" disabled="true">
       <f:convertDateTime type="time" pattern="HH:mm"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <tx:time label="Time (Seconds)" value="#{dateController.once}" disabled="true">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
     </tx:time>
-    <tc:cell/>
+    <tc:panel/>
 
     <!-- code-sniplet-start id="calendar" -->
     <tc:calendar/>
     <!-- code-sniplet-end id="calendar" -->
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="2"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
+    </tc:panel>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml Wed Apr  8 14:21:03 2015
@@ -129,7 +129,9 @@
                      suggestMethod="#{inputSuggestController.getCitySuggestItems}"/>
             </tc:panel>
 
-            <tc:cell spanY="3"/>
+            <tc:panel>
+              <tc:gridLayoutConstraint rowSpan="3"/>
+            </tc:panel>
 
             <tx:selectOneChoice label="State:"
                                 id="isState"
@@ -146,7 +148,7 @@
           <tc:separator/>
     -->
 
-    <tc:cell/>
+    <tc:panel/>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml Wed Apr  8 14:21:03 2015
@@ -160,7 +160,7 @@
         <tc:button label="Hello"/>
         <tc:button label="WWWWWWWWWW"/>
         <tc:button label="llllllllll"/>
-        <tc:cell/>
+        <tc:panel/>
 
       </tc:panel>
 
@@ -171,7 +171,7 @@
 
         <tc:button
             label="The goal of Tobago is to provide the community with a well designed set of user interface components."/>
-        <tc:cell/>
+        <tc:panel/>
 
       </tc:panel>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml Wed Apr  8 14:21:03 2015
@@ -29,7 +29,7 @@
     </f:facet>
 
     <tc:messages/>
-    <tc:cell scrollbars="auto">
+    <tc:panel>
       <tc:out value="#{exceptionContext.exception}" escape="false"/>
 
 <!-- TODO
@@ -52,7 +52,7 @@
       %>
 -->
 
-    </tc:cell>
+    </tc:panel>
   </tc:panel>
 
 </ui:composition>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/fileUpload.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/fileUpload.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/fileUpload.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/fileUpload.jsp Wed Apr  8 14:21:03 2015
@@ -34,17 +34,20 @@
         <tc:validateFileItem maxSize="299" />
       </tc:file>
       <%--tc:messages/--%>
-      <tc:cell spanX="2"/>
-      <tc:cell spanX="2">
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="2"/>
+      </tc:panel>
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="2"/>
         <tc:panel>
           <f:facet name="layout">
             <tc:gridLayout columns="*;auto;*" rows="20px"/>
           </f:facet>
-          <tc:cell />
+          <tc:panel/>
           <tc:button label="Submit" defaultCommand="true" />
-          <tc:cell />
+          <tc:panel/>
         </tc:panel>
-      </tc:cell>
+      </tc:panel>
     </tc:box>
     <%--/tc:panel--%>
   </tc:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/menu.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/menu.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/menu.jsp Wed Apr  8 14:21:03 2015
@@ -31,7 +31,7 @@
           <tc:menu label="File" binding="#{test.fileMenu}"/>
         </tc:menuBar>
       </f:facet>
-      <tc:cell/>
+      <tc:panel/>
     </tc:box>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/messages.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/messages.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/messages.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/messages.jsp Wed Apr  8 14:21:03 2015
@@ -39,7 +39,7 @@
       </tx:date>
       <tc:messages for="validityEnd"/>
       <tc:button label="Check dates" action="#{controller.checkDates}"/>
-      <tc:cell/>
+      <tc:panel/>
     </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup.jsp Wed Apr  8 14:21:03 2015
@@ -40,7 +40,7 @@
               <tc:out id="text2" rendered="true"
                 value="Text 2"/>
 
-              <tc:cell id="cell"/>
+              <tc:panel id="cell"/>
 
               <tc:panel id="buttonPanel">
                 <f:facet name="layout">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup2.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup2.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/popup2.jsp Wed Apr  8 14:21:03 2015
@@ -21,52 +21,57 @@
 
 <f:view>
   <tc:page id="inputPage" width="500px" height="300px">
-   <tc:panel id="inputPanel">
-     <tc:button id="popupButton"
-       label="Popup">
-       <f:facet name="popup">
-         <tc:popup id="popup" width="400" height="220">
-
-           <tc:box id="box" label="Popup">
-               <f:facet name="layout">
-                 <tc:gridLayout rows="*;auto;auto;auto;54px;auto" columns="*;*;*"/>
-               </f:facet>
-               <tc:cell spanX="3">
-                 <tc:out value="Text"/>
-               </tc:cell>
-
-               <tc:cell spanX="2">
-                 <tc:label value="label1"/>
-               </tc:cell>
-               <tc:cell/>
-
-               <tc:cell spanX="2">
-                 <tc:selectOneChoice id="choice">
-                   <tc:selectItem itemLabel="" itemValue=""/>
-                 </tc:selectOneChoice>
-               </tc:cell>
-               <tc:cell/>
-
-               <tc:cell spanX="3">
-                 <tc:label value="label2"/>
-               </tc:cell>
-               <tc:cell spanX="3">
-                 <tc:textarea id="textarea"/>
-               </tc:cell>
-
-               <tc:cell/>
-               <tc:button id="saveButton"
-                 label="save">
-                 <tc:attribute name="popupClose" value="afterSubmit"/>
-               </tc:button>
-               <tc:button id="cancelButton"
-                 label="cancel">
-                 <tc:attribute name="popupClose" value="immediate"/>
-               </tc:button>
-           </tc:box>
-         </tc:popup>
-       </f:facet>
-     </tc:button>
-   </tc:panel>
- </tc:page>
+    <tc:panel id="inputPanel">
+      <tc:button id="popupButton"
+                 label="Popup">
+        <f:facet name="popup">
+          <tc:popup id="popup" width="400" height="220">
+
+            <tc:box id="box" label="Popup">
+              <f:facet name="layout">
+                <tc:gridLayout rows="*;auto;auto;auto;54px;auto" columns="*;*;*"/>
+              </f:facet>
+              <tc:panel>
+                <tc:gridLayoutConstraint columnSpan="3"/>
+                <tc:out value="Text"/>
+              </tc:panel>
+
+              <tc:panel>
+                <tc:gridLayoutConstraint columnSpan="2"/>
+                <tc:label value="label1"/>
+              </tc:panel>
+              <tc:panel/>
+
+              <tc:panel>
+                <tc:gridLayoutConstraint columnSpan="2"/>
+                <tc:selectOneChoice id="choice">
+                  <tc:selectItem itemLabel="" itemValue=""/>
+                </tc:selectOneChoice>
+              </tc:panel>
+              <tc:panel/>
+
+              <tc:panel>
+                <tc:gridLayoutConstraint columnSpan="3"/>
+                <tc:label value="label2"/>
+              </tc:panel>
+              <tc:panel>
+                <tc:gridLayoutConstraint columnSpan="3"/>
+                <tc:textarea id="textarea"/>
+              </tc:panel>
+
+              <tc:panel/>
+              <tc:button id="saveButton"
+                         label="save">
+                <tc:attribute name="popupClose" value="afterSubmit"/>
+              </tc:button>
+              <tc:button id="cancelButton"
+                         label="cancel">
+                <tc:attribute name="popupClose" value="immediate"/>
+              </tc:button>
+            </tc:box>
+          </tc:popup>
+        </f:facet>
+      </tc:button>
+    </tc:panel>
+  </tc:page>
 </f:view>  

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/renderedPartially.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/renderedPartially.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/renderedPartially.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/renderedPartially.jsp Wed Apr  8 14:21:03 2015
@@ -33,9 +33,9 @@
         </f:facet>
       </tc:selectOneChoice>
       <tc:in value="#{controller.value}" readonly="true"/>
-      <tc:cell/>
+      <tc:panel/>
       <tc:messages/>
-      <tc:cell/>
+      <tc:panel/>
     </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/selectOneChoice.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/selectOneChoice.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/selectOneChoice.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/selectOneChoice.jsp Wed Apr  8 14:21:03 2015
@@ -29,13 +29,13 @@
         <f:selectItems value="#{controller.dateItems}"/>
       </tc:selectOneChoice>
       <tc:in value="#{controller.date}" readonly="true" />
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="Submit"/>
-      <tc:cell/>
-      <tc:cell/>
+      <tc:panel/>
+      <tc:panel/>
       <tc:messages/>
-      <tc:cell/>
-      <tc:cell/>
+      <tc:panel/>
+      <tc:panel/>
     </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarDetail.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarDetail.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarDetail.jsp Wed Apr  8 14:21:03 2015
@@ -35,12 +35,12 @@
        <tx:in value="#{test.eccen}" label="Eccen" readonly="true" />
        <tx:in value="#{test.discoverer}" label="Discoverer" readonly="true" />
        <tx:in value="#{test.discoverYear}" label="DiscoverYear" readonly="true" />  
-       <tc:cell/>
+       <tc:panel/>
         <tc:panel>
           <f:facet name="layout">
             <tc:gridLayout columns="4*;1*"  />
           </f:facet>
-          <tc:cell />
+          <tc:panel />
           <tc:button action="solarList" label="Return To List" defaultCommand="true" />
         </tc:panel>
     </tc:box>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarList2.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarList2.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarList2.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/solarList2.jsp Wed Apr  8 14:21:03 2015
@@ -30,9 +30,9 @@
       <f:facet name="layout">
         <tc:gridLayout columns="1*;auto;1*"/>
       </f:facet>
-      <tc:cell/>
+      <tc:panel/>
       <tc:button action="#{test.export}" label="Export" transition="false" />
-      <tc:cell/>
+      <tc:panel/>
     </tc:panel>
 
   </tc:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/hello.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/hello.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/hello.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/hello.jsp Wed Apr  8 14:21:03 2015
@@ -26,7 +26,7 @@
     </f:facet>
     <tc:out value="Hello #{user.name}!"/>
     <tc:button action="helloWorld" label="Return"/>
-    <tc:cell/>
-    <tc:cell/>
+    <tc:panel/>
+    <tc:panel/>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/index.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/index.jsp Wed Apr  8 14:21:03 2015
@@ -26,7 +26,7 @@
     </f:facet>
     <tx:in label="Your Name" tip="Please enter your name here!" value="#{user.name}"/>
     <tc:button action="sayHello" label="Click Here"/>
-    <tc:cell/>
-    <tc:cell/>
+    <tc:panel/>
+    <tc:panel/>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/inputSlider.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/inputSlider.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/inputSlider.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/inputSlider.jsp Wed Apr  8 14:21:03 2015
@@ -33,8 +33,8 @@
       <tcs:numberSlider value="#{controller.sliderValue}" min="0" max="200">
       </tcs:numberSlider>
       <tc:button action="#{controller.sliderSubmit}" label="Submit" />
-      <tc:cell/>
-      <tc:cell/>
+      <tc:panel/>
+      <tc:panel/>
     </tc:box>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/navigation.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/navigation.jsp Wed Apr  8 14:21:03 2015
@@ -30,6 +30,6 @@
 
     <tc:link link="selectManyShuttle.jsp" label="selectManyShuttle.jsp" target="View"/>
 
-    <tc:cell/>
+    <tc:panel/>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/selectManyShuttle.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/selectManyShuttle.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/selectManyShuttle.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/selectManyShuttle.jsp Wed Apr  8 14:21:03 2015
@@ -30,17 +30,17 @@
       <f:facet name="layout">
         <tc:gridLayout columns="*" rows="*;25px"/>
       </f:facet>
-      <tcs:selectManyShuttle value="#{controller.shuffleValue}"
+      <tc:selectManyShuttle value="#{controller.shuffleValue}"
           unselectedLabel="Available Soups" selectedLabel="Selected Soups">
         <f:selectItem itemValue="suppe" itemLabel="suppe" />
         <f:selectItem itemValue="soup" itemLabel="soup" />
         <f:selectItem itemValue="soupe" itemLabel="soupe" />
-      </tcs:selectManyShuttle>
+      </tc:selectManyShuttle>
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout columns="*;100px" rows="*"/>
         </f:facet>
-        <tc:cell/>
+        <tc:panel/>
         <tc:button action="#{controller.submit}" label="Submit" />
       </tc:panel>
     </tc:box>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/admin.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/admin.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/admin.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/admin.jsp Wed Apr  8 14:21:03 2015
@@ -25,21 +25,26 @@
         <tc:gridLayout columns="*;100px;*" rows="auto;*;auto;*"/>
       </f:facet>
 
-      <tc:cell spanX="3">
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
         <tc:out value="Hello Admin" />
-      </tc:cell>
+      </tc:panel>
 
-      <tc:cell spanX="3" />
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="logout" action="#{controller.logout}"/>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="start" action="start"/>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell spanX="3" />
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
     </tc:panel>
   </jsp:body>
 </layout:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/index.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/index.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/application/index.jsp Wed Apr  8 14:21:03 2015
@@ -25,21 +25,22 @@
         <tc:gridLayout columns="*;100px;*" rows="auto;*;auto;*"/>
       </f:facet>
 
-      <tc:cell spanX="3">
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
         <tc:out value="Hello World" />
-      </tc:cell>
+      </tc:panel>
 
-      <tc:cell spanX="3" />
+      <tc:gridLayoutConstraint columnSpan="3"/>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="logout" action="#{controller.logout}"/>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell/>
+      <tc:panel/>
       <tc:button label="admin" action="#{controller.admin}"/>
-      <tc:cell/>
+      <tc:panel/>
 
-      <tc:cell spanX="3" />
+      <tc:gridLayoutConstraint columnSpan="3"/>
     </tc:panel>
   </jsp:body>
 </layout:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/error.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/error.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/error.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/error.jsp Wed Apr  8 14:21:03 2015
@@ -32,7 +32,7 @@
           <tc:gridLayout columns="1*;100px"/>
         </f:facet>
 
-        <tc:cell/>
+        <tc:panel/>
 
         <tc:button link="/index.jsp" label="Home"/>
       </tc:panel>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/login.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/login.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/login.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/auth/login.jsp Wed Apr  8 14:21:03 2015
@@ -38,7 +38,7 @@
         <tc:gridLayout columns="1*;100px"/>
       </f:facet>
 
-      <tc:cell/>
+      <tc:panel/>
 
       <tc:button defaultCommand="true"
           label="Login"/>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/public.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/public.jsp?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/public.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/public.jsp Wed Apr  8 14:21:03 2015
@@ -25,21 +25,26 @@
         <tc:gridLayout columns="*;100px;*" rows="auto;*;auto;auto;*"/>
       </f:facet>
 
-      <tc:cell spanX="3">
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
         <tc:out value="To login to this test application you need a user in the role 'tobago-example-security'." />
-      </tc:cell>
+      </tc:panel>
 
-      <tc:cell spanX="3" />
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
       <tc:button label="Testing unsecured methodbinding" action="#{controller.doSomethingElse}" />
       <tc:button label="Good Login" link="/application/index.jsp"/>
       <tc:button label="Testing secured methodbinding" action="#{controller.doSomething}" />
-      <tc:cell/>
+      <tc:panel/>
       <tc:messages/>
-      <tc:cell/>
+      <tc:panel/>
 
 
-      <tc:cell spanX="3" />
+      <tc:panel>
+        <tc:gridLayoutConstraint columnSpan="3"/>
+      </tc:panel>
 
     </tc:panel>
   </jsp:body>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/3x3-center.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/3x3-center.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/3x3-center.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/3x3-center.xhtml Wed Apr  8 14:21:03 2015
@@ -30,13 +30,17 @@
     </f:facet>
     <tc:gridLayoutConstraint width="300px" height="300px"/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
-    <tc:cell/>
+    <tc:panel/>
     <tc:image value="pidgeon-point.jpg" id="in"/>
-    <tc:cell/>
+    <tc:panel/>
 
-    <tc:cell spanX="3"/>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="3"/>
+    </tc:panel>
 
     <tc:script file="script/tobago-assert.js"/>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/position-4x4-span-steps.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/position-4x4-span-steps.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/position-4x4-span-steps.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/position-4x4-span-steps.xhtml Wed Apr  8 14:21:03 2015
@@ -22,34 +22,40 @@
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core">
 
-  <tc:page id="page" label="Note: the &lt;tc:cell&gt; is deprecated">
+  <tc:page id="page">
     <f:facet name="layout">
       <tc:gridLayout columns="6*;9*;13*;2*" rows="4*;11*;10*;5*"/>
     </f:facet>
     <tc:gridLayoutConstraint width="315px" height="315px"/>
 
     <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:cell spanY="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint rowSpan="2"/>
       <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    </tc:cell>
-    <tc:cell spanX="2">
+    </tc:panel>
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
       <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    </tc:cell>
+    </tc:panel>
     <tc:image id="i-3" value="pidgeon-point.jpg"/>
-    <tc:cell spanY="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint rowSpan="2"/>
       <tc:image id="i-4" value="pidgeon-point.jpg"/>
-    </tc:cell>
+    </tc:panel>
     <tc:image id="i-5" value="pidgeon-point.jpg"/>
-    <tc:cell spanX="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
       <tc:image  id="i-6" value="pidgeon-point.jpg"/>
-    </tc:cell>
-    <tc:cell spanY="2">
+    </tc:panel>
+    <tc:panel>
+      <tc:gridLayoutConstraint rowSpan="2"/>
       <tc:image id="i-7" value="pidgeon-point.jpg"/>
-    </tc:cell>
+    </tc:panel>
     <tc:image id="i-8" value="pidgeon-point.jpg"/>
-    <tc:cell spanX="2">
+    <tc:panel>
+      <tc:gridLayoutConstraint columnSpan="2"/>
       <tc:image id="i-9" value="pidgeon-point.jpg"/>
-    </tc:cell>
+    </tc:panel>
 
     <tc:script file="script/tobago-assert.js"/>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/subview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/subview.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/subview.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/cell/subview.xhtml Wed Apr  8 14:21:03 2015
@@ -22,14 +22,14 @@
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core">
 
-  <tc:page id="page" label="Note: the &lt;tc:cell&gt; is deprecated">
+  <tc:page id="page">
     <f:facet name="layout">
       <tc:gridLayout rows="*;auto"/>
     </f:facet>
     <tc:gridLayoutConstraint width="100px" height="310px"/>
 
     <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:cell>
+    <tc:panel>
       <f:subview id="subview">
         <tc:panel>
           <f:facet name="layout">
@@ -40,7 +40,7 @@
           <tc:image id="i-3" value="pidgeon-point.jpg"/>
         </tc:panel>
       </f:subview>
-    </tc:cell>
+    </tc:panel>
 
     <tc:script file="script/tobago-assert.js"/>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml Wed Apr  8 14:21:03 2015
@@ -23,7 +23,7 @@
 
 <tc:page id="page">
 
-<tc:cell scrollbars="auto">
+<tc:panel>
 
 <tc:panel id="jquery_date_time_pattern">
 <f:facet name="layout">
@@ -488,7 +488,7 @@
 
 </tc:panel>
 
-</tc:cell>
+</tc:panel>
 
 <tc:script file="test/date/datetime.js"/>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/gridLayout/nested-v.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/gridLayout/nested-v.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/gridLayout/nested-v.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/gridLayout/nested-v.xhtml Wed Apr  8 14:21:03 2015
@@ -35,7 +35,7 @@
         <f:facet name="layout">
           <tc:gridLayout id="panel-grid" columns="*;100px"/>
         </f:facet>
-        <tc:cell id="cell"/>
+        <tc:panel id="cell"/>
         <tc:button id="button" label="Submit"/>
       </tc:panel>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/hidden/hidden.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/hidden/hidden.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/hidden/hidden.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/hidden/hidden.xhtml Wed Apr  8 14:21:03 2015
@@ -45,7 +45,7 @@
     <tc:button id="fill" label="1. fill hidden fields" onclick="fillHiddenFields();"/>
     <tc:button label="2. submit hidden fields..."/>
 
-    <tc:cell/>
+    <tc:panel/>
     
     <tc:script>
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/image/disabled.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/image/disabled.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/image/disabled.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/image/disabled.xhtml Wed Apr  8 14:21:03 2015
@@ -44,8 +44,8 @@
     <tc:link id="link" image="image/foo.gif" label="link"/>
     <tc:link id="link-d" image="image/foo.gif" label="link" disabled="true"/>
 
-    <tc:cell/>
-    <tc:cell/>
+    <tc:panel/>
+    <tc:panel/>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/id-and-fieldId.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/id-and-fieldId.xhtml?rev=1672093&r1=1672092&r2=1672093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/id-and-fieldId.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/id-and-fieldId.xhtml Wed Apr  8 14:21:03 2015
@@ -129,9 +129,9 @@
     <tc:in id="label14"/>
     <tc:in id="field14"/>
 
-    <tc:cell/>
-    <tc:cell/>
-    <tc:cell/>
+    <tc:panel/>
+    <tc:panel/>
+    <tc:panel/>
     <tc:button label="Reload"/>
 
     <tc:script file="test/in/id-and-fieldId.js"/>