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/04 11:21:09 UTC

svn commit: r1701192 [1/2] - in /myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp: ./ content/01-basic/ content/01-basic/00/ content/01-basic/02/ content/01-basic/04/ content/02-sheet/ content/02-sheet/00/ content...

Author: lofwyr
Date: Fri Sep  4 09:21:08 2015
New Revision: 1701192

URL: http://svn.apache.org/r1701192
Log:
TOBAGO-1485: Label support of the tc-library, so the tx-tibrary will be unnecessary (and deprecated)
* demo

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet-nested.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/00-tinymce/tinymce.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/wysiwyg-editor.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/90-non-faces-request/x-fish-pond.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
 
   <ui:param name="title" value="Input"/>
 
@@ -40,25 +38,25 @@
       <tc:in value="Some Text"/>
     </tc:flexLayout>
 
-    <tx:in label="Input (focus)" focus="true" value="Some Text"/>
+    <tc:in label="Input (focus)" focus="true" value="Some Text"/>
 
-    <tx:in label="Password" password="true" value="Asterics"/>
+    <tc:in label="Password" password="true" value="Asterics"/>
 
     <tc:textarea
         value="Some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, ..."/>
 
-    <tx:textarea label="Text Area"
+    <tc:textarea label="Text Area"
                  value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
 
-    <tx:textarea label="Read Only"
+    <tc:textarea label="Read Only"
                  readonly="true"
                  value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
 
-    <tx:textarea label="Disabled"
+    <tc:textarea label="Disabled"
                  disabled="true"
                  value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
 
-    <tx:textarea label="Area (focus)" focus="true"
+    <tc:textarea label="Area (focus)" focus="true"
                  value="Some Text"/>
 
     <tc:flowLayout>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 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">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Time Specific Controls"/>
@@ -31,16 +30,16 @@
     </f:facet>
 
     <!-- code-sniplet-start id="date" -->
-    <tx:in label="Date as Text" value="#{dateController.once}">
+    <tc:in label="Date as Text" value="#{dateController.once}">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
-    </tx:in>
+    </tc:in>
     <!-- code-sniplet-end id="date" -->
     <tc:panel/>
 
     <!-- code-sniplet-start id="date" -->
-    <tx:date label="Date" value="#{dateController.once}">
+    <tc:date label="Date" value="#{dateController.once}">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
-    </tx:date>
+    </tc:date>
     <!-- code-sniplet-end id="date" -->
     <tc:panel/>
 
@@ -53,9 +52,9 @@
 
     <!-- code-sniplet-start id="dateTime" -->
 <!--
-    <tx:date label="Date/Time" value="#{dateController.once}">
+    <tc:date label="Date/Time" value="#{dateController.once}">
       <f:convertDateTime pattern="dd.MM.yyyy HH:mm"/>
-    </tx:date>
+    </tc:date>
 -->
     <!-- code-sniplet-end id="dateTime" -->
 <!--
@@ -63,71 +62,71 @@
 -->
 
 <!--
-    <tx:date label="Date (focus)" focus="true">
+    <tc:date label="Date (focus)" focus="true">
 -->
-    <tx:date label="Date (focus)">
+    <tc:date label="Date (focus)">
       <f:convertDateTime pattern="dd.MM.yyyy"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Short style" value="#{dateController.once}">
+    <tc:date label="Short style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="short" type="both" timeStyle="short"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Medium Style" value="#{dateController.once}">
+    <tc:date label="Medium Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="medium" type="both" timeStyle="medium"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Long Style" value="#{dateController.once}">
+    <tc:date label="Long Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="long" type="both" timeStyle="long"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Full Style" value="#{dateController.once}">
+    <tc:date label="Full Style" value="#{dateController.once}">
       <f:convertDateTime dateStyle="full" type="both" timeStyle="full"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Month" value="#{dateController.once}">
+    <tc:date label="Month" value="#{dateController.once}">
       <f:convertDateTime pattern="MM/yyyy"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:date label="Year" value="#{dateController.once}">
+    <tc:date label="Year" value="#{dateController.once}">
       <f:convertDateTime pattern="yyyy"/>
-    </tx:date>
+    </tc:date>
     <tc:panel/>
 
-    <tx:time label="Time" value="#{dateController.once}">
+    <tc:time label="Time" value="#{dateController.once}">
       <f:convertDateTime type="time" pattern="HH:mm"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
-    <tx:time label="Time (Seconds)" value="#{dateController.once}">
+    <tc:time label="Time (Seconds)" value="#{dateController.once}">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
-    <tx:time label="Time" value="#{dateController.once}" readonly="true">
+    <tc:time label="Time" value="#{dateController.once}" readonly="true">
       <f:convertDateTime type="time" pattern="HH:mm"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
-    <tx:time label="Time (Seconds)" value="#{dateController.once}" readonly="true">
+    <tc:time label="Time (Seconds)" value="#{dateController.once}" readonly="true">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
-    <tx:time label="Time" value="#{dateController.once}" disabled="true">
+    <tc:time label="Time" value="#{dateController.once}" disabled="true">
       <f:convertDateTime type="time" pattern="HH:mm"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
-    <tx:time label="Time (Seconds)" value="#{dateController.once}" disabled="true">
+    <tc:time label="Time (Seconds)" value="#{dateController.once}" disabled="true">
       <f:convertDateTime type="time" pattern="HH:mm:ss"/>
-    </tx:time>
+    </tc:time>
     <tc:panel/>
 
     <!-- code-sniplet-start id="calendar" -->

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml Fri Sep  4 09:21:08 2015
@@ -20,7 +20,7 @@
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core" xmlns:tx="http://myfaces.apache.org/tobago/extension">
+                xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.basic}"/>
 
   <tc:panel>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml Fri Sep  4 09:21:08 2015
@@ -19,66 +19,62 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Sheet as Master-Details example"/>
 
   <tc:panel id="panel">
-    <f:facet name="layout">
-      <tc:gridLayout rows="1*;3*" columns="*;*"/>
-    </f:facet>
 
     <tc:out escape="false" value="Klick on a row">
       <tc:gridLayoutConstraint columnSpan="2"/>
     </tc:out>
 
-    <tc:box label="List of Objects">
-      <f:facet name="toolBar">
-        <tc:toolBar>
-          <tc:toolBarCommand label="Deselect" actionListener="#{demo.selectLuminary}"
-                             renderedPartially=":page:detail" immediate="true">
-            <tc:resetInputActionListener/>
-          </tc:toolBarCommand>
-        </tc:toolBar>
-      </f:facet>
-
-      <tc:sheet value="#{demo.solarList}" id="sheet"
-                columns="*" var="luminary" selectable="single">
-        <tc:column label="#{overviewBundle.solarArrayName}" id="name">
-          <tc:out value="#{luminary.name}" id="t_name"/>
-        </tc:column>
-        <tc:columnEvent event="click">
-          <tc:command actionListener="#{demo.selectLuminary}" renderedPartially=":page:detail" immediate="true">
-            <tc:resetInputActionListener/>
-          </tc:command>
-        </tc:columnEvent>
-      </tc:sheet>
-    </tc:box>
-
-    <tc:box id="detail" label="Details">
-
-      <tc:panel rendered="#{demo.currentSolarObject != null}">
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;auto;auto"/>
+    <tc:segmentLayout medium="6;6">
+
+      <tc:box label="List of Objects">
+        <f:facet name="toolBar">
+          <tc:toolBar>
+            <tc:toolBarCommand label="Deselect" actionListener="#{demo.selectLuminary}"
+                               renderedPartially=":page:detail" immediate="true">
+              <tc:resetInputActionListener/>
+            </tc:toolBarCommand>
+          </tc:toolBar>
         </f:facet>
-        <tx:in label="Name" value="#{demo.currentSolarObject.name}" required="true"/>
-        <tx:in label="Number" value="#{demo.currentSolarObject.number}"/>
-        <tx:in label="Orbit" value="#{demo.currentSolarObject.orbit}"/>
-        <tx:in label="Distance" value="#{demo.currentSolarObject.distance}"/>
-        <tx:in label="Period" value="#{demo.currentSolarObject.period}"/>
-        <tx:in label="Obliquity" value="#{demo.currentSolarObject.incl}"/>
-        <tx:in label="Eccentricity" value="#{demo.currentSolarObject.eccen}"/>
-        <tx:in label="Discoverer" value="#{demo.currentSolarObject.discoverer}"/>
-        <tx:in label="Discover Year" value="#{demo.currentSolarObject.discoverYear}"/>
-      </tc:panel>
-
-      <tc:panel rendered="#{demo.currentSolarObject == null}">
-        <tc:out value="Please select a solar object on the left side to show its details."/>
-      </tc:panel>
 
-    </tc:box>
+        <tc:sheet value="#{demo.solarList}" id="sheet"
+                  columns="*" var="luminary" selectable="single">
+          <tc:column label="#{overviewBundle.solarArrayName}" id="name">
+            <tc:out value="#{luminary.name}" id="t_name"/>
+          </tc:column>
+          <tc:columnEvent event="click">
+            <tc:command actionListener="#{demo.selectLuminary}" renderedPartially=":page:detail" immediate="true">
+              <tc:resetInputActionListener/>
+            </tc:command>
+          </tc:columnEvent>
+        </tc:sheet>
+      </tc:box>
+
+      <tc:box id="detail" label="Details">
+
+        <tc:panel rendered="#{demo.currentSolarObject != null}">
+          <tc:in label="Name" value="#{demo.currentSolarObject.name}" required="true"/>
+          <tc:in label="Number" value="#{demo.currentSolarObject.number}"/>
+          <tc:in label="Orbit" value="#{demo.currentSolarObject.orbit}"/>
+          <tc:in label="Distance" value="#{demo.currentSolarObject.distance}"/>
+          <tc:in label="Period" value="#{demo.currentSolarObject.period}"/>
+          <tc:in label="Obliquity" value="#{demo.currentSolarObject.incl}"/>
+          <tc:in label="Eccentricity" value="#{demo.currentSolarObject.eccen}"/>
+          <tc:in label="Discoverer" value="#{demo.currentSolarObject.discoverer}"/>
+          <tc:in label="Discover Year" value="#{demo.currentSolarObject.discoverYear}"/>
+        </tc:panel>
+
+        <tc:panel rendered="#{demo.currentSolarObject == null}">
+          <tc:out value="Please select a solar object on the left side to show its details."/>
+        </tc:panel>
+
+      </tc:box>
+
+    </tc:segmentLayout>
 
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.sheet}"/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.sheet}"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet-nested.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet-nested.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet-nested.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet-nested.xhtml Fri Sep  4 09:21:08 2015
@@ -19,10 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{overviewBundle.sheet}"/>
 
     <tc:sheet value="#{demo.solarList}" id="sheet"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.sheet}"/>
 
@@ -37,60 +35,60 @@
               <f:facet name="layout">
                 <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;1*;auto"/>
               </f:facet>
-              <tx:selectOneChoice label="showHeader"
+              <tc:selectOneChoice label="showHeader"
                                   value="#{overviewController.sheetConfig.sheetShowHeader}"
                                   tip="TODO: show Header Text">
                 <f:selectItem itemValue="#{true}" itemLabel="True"/>
                 <f:selectItem itemValue="#{false}" itemLabel="False"/>
-              </tx:selectOneChoice>
-              <tx:selectBooleanCheckbox
+              </tc:selectOneChoice>
+              <tc:selectBooleanCheckbox
                   label="showPagingAlways" value="#{overviewController.sheetConfig.showPagingAlways}"/>
-              <tx:in label="first"
+              <tc:in label="first"
                      value="#{overviewController.sheetConfig.sheetFirst}"
                      tip="TODO: paging Start Text">
                 <f:validateLongRange minimum="0"/>
-              </tx:in>
-              <tx:in label="rows"
+              </tc:in>
+              <tc:in label="rows"
                      value="#{overviewController.sheetConfig.sheetRows}"
                      tip="TODO: paging Lenght Text">
                 <f:validateLongRange minimum="0"/>
-              </tx:in>
+              </tc:in>
 
-              <tx:selectOneChoice label="showRowRange"
+              <tc:selectOneChoice label="showRowRange"
                                   value="#{overviewController.sheetConfig.sheetRowPagingPosition}"
                                   tip="TODO: paging DirectLinkCount Text">
                 <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-              </tx:selectOneChoice>
+              </tc:selectOneChoice>
 
-              <tx:selectOneChoice label="showPageRange"
+              <tc:selectOneChoice label="showPageRange"
                                   value="#{overviewController.sheetConfig.sheetPagePagingPosition}"
                                   tip="TODO: paging DirectLinkCount Text">
                 <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-              </tx:selectOneChoice>
-              <tx:selectBooleanCheckbox label="with arrows"
+              </tc:selectOneChoice>
+              <tc:selectBooleanCheckbox label="with arrows"
                                         value="#{overviewController.sheetConfig.showPageRangeArrows}"
                                         tip="TODO: showPageRangeArrows Text"/>
 
-              <tx:selectOneChoice label="showDirectLinks"
+              <tc:selectOneChoice label="showDirectLinks"
                                   value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
                                   tip="TODO: paging DirectLinkCount Text">
                 <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-              </tx:selectOneChoice>
-              <tx:selectBooleanCheckbox label="with arrows"
+              </tc:selectOneChoice>
+              <tc:selectBooleanCheckbox label="with arrows"
                                         value="#{overviewController.sheetConfig.showDirectLinksArrows}"
                                         tip="TODO: showDirectLinksArrows Text"/>
 
-              <tx:selectOneChoice label="directLinkCount"
+              <tc:selectOneChoice label="directLinkCount"
                                   value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
                                   tip="TODO: paging DirectLinkCount Text">
                 <f:selectItems value="#{overviewController.sheetConfig.sheetDirectLinkCountItems}"/>
-              </tx:selectOneChoice>
+              </tc:selectOneChoice>
 
-              <tx:selectOneChoice label="selectable"
+              <tc:selectOneChoice label="selectable"
                                   value="#{overviewController.sheetConfig.selectable}"
                                   tip="TODO: selectable Text">
                 <f:selectItems value="#{overviewController.sheetConfig.sheetSelectableItems}"/>
-              </tx:selectOneChoice>
+              </tc:selectOneChoice>
 
               <tc:panel/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml Fri Sep  4 09:21:08 2015
@@ -19,10 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{overviewBundle.sheet}"/>
 
     <tc:sheet value="#{demo.solarList}" id="sheet"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml Fri Sep  4 09:21:08 2015
@@ -19,10 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="Tree - Different Command Types"/>
 
   <tc:treeMenu value="#{treeController.mixed}" var="node" id="data">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tree}"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Tree - Editor"/>
   <tc:panel>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tree} Menu"/> <!-- todo i18n -->
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tree}"/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tree}"/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 
@@ -34,18 +33,18 @@
       <tc:tab label="#{overviewBundle.tabPlanet}">
         <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
         <tc:image value="image/feather-leaf.png"/>
-        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
                label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tx:in value="#{demo.solar.planets[0].mass}"
+        <tc:in value="#{demo.solar.planets[0].mass}"
                label="#{overviewBundle.solarPlanetMass}"/>
         <tc:panel/>
       </tc:tab>
       <tc:tab label="#{overviewBundle.tabInsolar}">
         <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
         <tc:image value="image/feather-leaf.png"/>
-        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+        <tc:in value="#{demo.solar.planets[0].sunDistance}"
                label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
                label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
         <tc:panel/>
       </tc:tab>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadTag}"/>
@@ -41,9 +40,9 @@
           <tc:gridLayout rows="1*;auto;auto;1*"/>
         </f:facet>
         <tc:image value="image/feather-leaf.png"/>
-        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
                label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tx:in value="#{demo.solar.planets[0].mass}"
+        <tc:in value="#{demo.solar.planets[0].mass}"
                label="#{overviewBundle.solarPlanetMass}"/>
         <tc:panel/>
       </tc:tab>
@@ -60,9 +59,9 @@
         </f:facet>
         <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
         <tc:image value="image/feather-leaf.png"/>
-        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+        <tc:in value="#{demo.solar.planets[0].sunDistance}"
                label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
                label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
         <tc:panel/>
       </tc:tab>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tabSwitchTypeReloadPage}"/>
@@ -37,18 +36,18 @@
       <tc:tab label="#{overviewBundle.tabPlanet}">
         <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
         <tc:panel/>
-        <tx:in value="#{demo.solar.planets[0].diameter}" required="true"
+        <tc:in value="#{demo.solar.planets[0].diameter}" required="true"
                label="#{overviewBundle.solarPlanetDiameter}"/>
-        <tx:in value="#{demo.solar.planets[0].mass}"
+        <tc:in value="#{demo.solar.planets[0].mass}"
                label="#{overviewBundle.solarPlanetMass}"/>
         <tc:panel/>
       </tc:tab>
       <tc:tab label="#{overviewBundle.tabInsolar}">
         <f:facet name="layout"><tc:gridLayout rows="1*;auto;auto;1*"/></f:facet>
         <tc:panel/>
-        <tx:in value="#{demo.solar.planets[0].sunDistance}"
+        <tc:in value="#{demo.solar.planets[0].sunDistance}"
                label="#{overviewBundle.solarPlanetSunDistance}"/>
-        <tx:in value="#{demo.solar.planets[0].timeOfCirculation}"
+        <tc:in value="#{demo.solar.planets[0].timeOfCirculation}"
                label="#{overviewBundle.solarPlanetTimeOfCirculation}"/>
         <tc:panel/>
       </tc:tab>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.tab}"/>
   <tc:panel>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml Fri Sep  4 09:21:08 2015
@@ -134,7 +134,7 @@
 
     </tc:toolBar>
 
-    <tx:in value="#{overviewController.lastAction}" readonly="true"
+    <tc:in value="#{overviewController.lastAction}" readonly="true"
            label="#{overviewBundle.basic_lastActionLabel}"/>
 
     <tc:selectOneChoice value="#{overviewController.toolbarTextPosition}">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.validation}"/>
   <tc:panel>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="JSR-303: Bean Validation"/>
@@ -36,8 +35,8 @@
       <f:facet name="layout">
         <tc:gridLayout rows="auto;auto;auto;auto"/>
       </f:facet>
-      <tx:in label="Required" value="#{jsr303.required}"/>
-      <tx:in label="Length" value="#{jsr303.length}"/>
+      <tc:in label="Required" value="#{jsr303.required}"/>
+      <tc:in label="Length" value="#{jsr303.length}"/>
     </tc:panel>
 
     <tc:panel/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.validation}"/>
@@ -34,21 +33,21 @@
       <f:facet name="layout">
         <tc:gridLayout columns="1*;1*"/>
       </f:facet>
-      <tx:in label="#{overviewBundle.validation_number}" markup="number" required="true"
+      <tc:in label="#{overviewBundle.validation_number}" markup="number" required="true"
              value="#{validationBean.number}">
         <f:validateLength minimum="7" maximum="7"/>
         <f:validateLongRange maximum="9000000"/>
-      </tx:in>
-      <tx:in label="#{overviewBundle.validation_price}" markup="number" value="#{validationBean.price}">
+      </tc:in>
+      <tc:in label="#{overviewBundle.validation_price}" markup="number" value="#{validationBean.price}">
         <f:validateDoubleRange minimum="0.01" maximum="1000"/>
         <f:convertNumber pattern="#,##0.00 ¤" currencySymbol="€" type="currency" />
-      </tx:in>
-      <tx:in label="#{overviewBundle.validation_custom}" validator="#{overviewController.customValidator}"
+      </tc:in>
+      <tc:in label="#{overviewBundle.validation_custom}" validator="#{overviewController.customValidator}"
              value="#{validationBean.custom}">
-      </tx:in>
+      </tc:in>
     </tc:panel>
 
-    <tx:textarea label="#{overviewBundle.validation_description}" required="true" value="#{validationBean.text}"/>
+    <tc:textarea label="#{overviewBundle.validation_description}" required="true" value="#{validationBean.text}"/>
 
     <tc:flowLayout textAlign="right">
       <tc:button action="#{overviewController.noop}" label="#{overviewBundle.validation_submit}"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.form}"/>
   <tc:panel>
@@ -46,11 +44,11 @@
         </f:facet>
 
         <tc:form id="form1">
-          <tx:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
+          <tc:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
           <tc:button label="#{overviewBundle.submitForm1}">
             <tc:gridLayoutConstraint rowSpan="2"/>
           </tc:button>
-          <tx:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
+          <tc:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
         </tc:form>
 
       </tc:box>
@@ -61,11 +59,11 @@
         </f:facet>
 
         <tc:form id="form2">
-          <tx:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue2}"/>
+          <tc:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue2}"/>
           <tc:button label="#{overviewBundle.submitForm2}">
             <tc:gridLayoutConstraint rowSpan="2"/>
           </tc:button>
-          <tx:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue2}"/>
+          <tc:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue2}"/>
         </tc:form>
       </tc:box>
 
@@ -76,11 +74,11 @@
           <tc:gridLayout rows="auto;auto" columns="*;100px"/>
         </f:facet>
 
-        <tx:in value="#{demo.text[2]}" required="true" label="#{overviewBundle.newValue2}"/>
+        <tc:in value="#{demo.text[2]}" required="true" label="#{overviewBundle.newValue2}"/>
         <tc:button label="#{overviewBundle.submitAll}">
           <tc:gridLayoutConstraint rowSpan="2"/>
         </tc:button>
-        <tx:in value="#{demo.text[2]}" readonly="true" label="#{overviewBundle.modelValue2}"/>
+        <tc:in value="#{demo.text[2]}" readonly="true" label="#{overviewBundle.modelValue2}"/>
         
       </tc:panel>
     </tc:box>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.theme}"/>
   <tc:panel>
@@ -36,10 +34,10 @@
         <tc:gridLayout columns="*;auto"/>
       </f:facet>
 
-      <tx:selectOneChoice value="#{clientConfigController2.theme}"
+      <tc:selectOneChoice value="#{clientConfigController2.theme}"
                           label="#{overviewBundle.theme_label}">
         <f:selectItems value="#{clientConfigController2.themeItems}"/>
-      </tx:selectOneChoice>
+      </tc:selectOneChoice>
       <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.theme_submit}"/>
     </tc:panel>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml Fri Sep  4 09:21:08 2015
@@ -19,10 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{overviewBundle.browser}"/>
   <tc:out escape="false" value="#{overviewBundle.browser_text}"/>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.locale} - #{overviewBundle.locale_title}"/>
@@ -30,10 +29,10 @@
 
     <tc:out escape="false" value="#{overviewBundle.locale_text}"/>
 
-      <tx:selectOneChoice value="#{clientConfigController2.locale}"
+      <tc:selectOneChoice value="#{clientConfigController2.locale}"
                           label="#{overviewBundle.locale}">
         <f:selectItems value="#{clientConfigController2.localeItems}"/>
-      </tx:selectOneChoice>
+      </tc:selectOneChoice>
 
       <tc:panel>
         <f:facet name="layout">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml Fri Sep  4 09:21:08 2015
@@ -19,9 +19,7 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="#{overviewBundle.layout}"/>
   <tc:panel>
@@ -37,34 +35,34 @@
       </f:facet>
 
       <!-- 1 -->
-      <tx:selectOneChoice value="#{overviewController.singleValue}"
+      <tc:selectOneChoice value="#{overviewController.singleValue}"
                           label="#{overviewBundle.layout_salutation}"
                           converter="salutationId">
         <f:selectItems value="#{overviewController.items}"/>
-      </tx:selectOneChoice>
+      </tc:selectOneChoice>
       <tc:panel/>
 
       <!-- 2 -->
-      <tx:in value="" label="#{overviewBundle.layout_firstName}"/>
-      <tx:in value="" label="#{overviewBundle.layout_lastName}"/>
+      <tc:in value="" label="#{overviewBundle.layout_firstName}"/>
+      <tc:in value="" label="#{overviewBundle.layout_lastName}"/>
 
       <!-- 3 -->
-      <tx:in value="" label="#{overviewBundle.layout_co}">
+      <tc:in value="" label="#{overviewBundle.layout_co}">
         <tc:gridLayoutConstraint columnSpan="2"/>
-      </tx:in>
+      </tc:in>
 
       <!-- 4 -->
-      <tx:in value="" label="#{overviewBundle.layout_street}"/>
-      <tx:in value="" label="#{overviewBundle.layout_streetNumber}"/>
+      <tc:in value="" label="#{overviewBundle.layout_street}"/>
+      <tc:in value="" label="#{overviewBundle.layout_streetNumber}"/>
 
       <!-- 5 -->
-      <tx:in value="" label="#{overviewBundle.layout_zipCode}"/>
-      <tx:in value="" label="#{overviewBundle.layout_city}"/>
+      <tc:in value="" label="#{overviewBundle.layout_zipCode}"/>
+      <tc:in value="" label="#{overviewBundle.layout_city}"/>
 
       <!-- 6 -->
-      <tx:textarea value="" label="#{overviewBundle.layout_note}">
+      <tc:textarea value="" label="#{overviewBundle.layout_note}">
         <tc:gridLayoutConstraint columnSpan="2"/>
-      </tx:textarea>
+      </tc:textarea>
     </tc:box>
     <!-- code-sniplet-end id="layoutManagementExample" -->
   </tc:panel>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Popups"/>
@@ -70,10 +69,10 @@
                 <f:selectItem itemLabel="B" itemValue="b"/>
               </tc:selectOneChoice>
               <tc:selectBooleanCheckbox value="#{reference.bool}"/>
-              <tx:in label="In" value="#{reference.text}" required="true"/>
-              <tx:date label="Date">
+              <tc:in label="In" value="#{reference.text}" required="true"/>
+              <tc:date label="Date">
                 <f:convertDateTime pattern="dd/MM/yyyy"/>
-              </tx:date>
+              </tc:date>
               <tc:image value="image/feather-leaf.png" width="16px" height="16px"/>
               <tc:panel/>
               <tc:panel>
@@ -105,7 +104,7 @@
                 <tc:gridLayout rows="auto;*;auto"/>
               </f:facet>
 
-              <tx:in label="Field" required="true" placeholder="Search"/>
+              <tc:in label="Field" required="true" placeholder="Search"/>
               <tc:panel/>
               <tc:panel>
                 <f:facet name="layout">
@@ -173,13 +172,13 @@
 
     </tc:panel>
 
-    <tx:in readonly="true" label="The Boolean" value="#{reference.bool}"/>
+    <tc:in readonly="true" label="The Boolean" value="#{reference.bool}"/>
 
-    <tx:in readonly="true" label="The Text" value="#{reference.text}"/>
+    <tc:in readonly="true" label="The Text" value="#{reference.text}"/>
 
-    <tx:in required="true" label="Required"/>
+    <tc:in required="true" label="Required"/>
 
-    <tx:selectOneChoice label="Select"/>
+    <tc:selectOneChoice label="Select"/>
 
     <tc:panel/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Select Controls"/>
@@ -47,13 +46,13 @@
     </tc:selectBooleanCheckbox>
 
     <!-- code-sniplet-start id="selectManyListbox" -->
-    <tx:selectManyListbox label="Contact via: ">
+    <tc:selectManyListbox label="Contact via: ">
       <f:selectItem itemValue="Phone" itemLabel="Phone"/>
       <f:selectItem itemValue="eMail" itemLabel="eMail"/>
       <f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
       <f:selectItem itemValue="Fax" itemLabel="Faxscimile"/>
-    </tx:selectManyListbox>
-    <tx:selectManyListbox label="Contact via: ">
+    </tc:selectManyListbox>
+    <tc:selectManyListbox label="Contact via: ">
       <f:selectItem itemValue="Phone" itemLabel="Phone"/>
       <f:selectItem itemValue="eMail" itemLabel="eMail"/>
       <f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
@@ -61,17 +60,17 @@
       <f:facet name="click">
         <tc:command/>
       </f:facet>
-    </tx:selectManyListbox>
+    </tc:selectManyListbox>
     <!-- code-sniplet-end id="selectManyListbox" -->
 
     <!-- code-sniplet-start id="selectOneChoice" -->
-    <tx:selectOneChoice value="selectOneChoice0"
+    <tc:selectOneChoice value="selectOneChoice0"
                         label="Contact me1: ">
       <tc:selectItem itemLabel="Letter" itemValue="letter"/>
       <tc:selectItem itemLabel="Phone" itemValue="phone"/>
       <tc:selectItem itemLabel="eMail" itemValue="eMail"/>
       <tc:selectItem itemLabel="Fax" itemValue="fax"/>
-    </tx:selectOneChoice>
+    </tc:selectOneChoice>
 
     <!-- code-sniplet-end id="selectOneChoice" -->
 
@@ -79,26 +78,26 @@
     With tc:form you enable partial validation and update model.
     <tc:form>
     -->
-    <tx:selectOneChoice value="#{reference.vehicle}"
+    <tc:selectOneChoice value="#{reference.vehicle}"
                         label="Vehicle: " valueChangeListener="#{reference.valueChanged}">
       <f:selectItems value="#{reference.selectItems}"/>
       <f:facet name="change">
         <tc:command action="#{reference.action}"/>
       </f:facet>
-    </tx:selectOneChoice>
-    <tx:selectOneChoice value="#{reference.manufacturer}"
+    </tc:selectOneChoice>
+    <tc:selectOneChoice value="#{reference.manufacturer}"
                         label="Manufacturer: " valueChangeListener="#{reference.valueChanged}">
       <f:selectItems value="#{reference.manufacturerSelectItems}"/>
-    </tx:selectOneChoice>
+    </tc:selectOneChoice>
 
     <!-- code-sniplet-start id="selectOneListbox" -->
-    <tx:selectOneListbox label="Contact via: ">
+    <tc:selectOneListbox label="Contact via: ">
       <f:selectItem itemValue="Phone" itemLabel="Phone"/>
       <f:selectItem itemValue="eMail" itemLabel="eMail"/>
       <f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
       <f:selectItem itemValue="Fax" itemLabel="Faxscimile"/>
-    </tx:selectOneListbox>
-    <tx:selectOneListbox label="Contact via: ">
+    </tc:selectOneListbox>
+    <tc:selectOneListbox label="Contact via: ">
       <f:selectItem itemValue="Phone" itemLabel="Phone"/>
       <f:selectItem itemValue="eMail" itemLabel="eMail"/>
       <f:selectItem itemValue="Mobile" itemLabel="Mobile"/>
@@ -106,7 +105,7 @@
       <f:facet name="click">
         <tc:command/>
       </f:facet>
-    </tx:selectOneListbox>
+    </tc:selectOneListbox>
     <!-- code-sniplet-end id="selectOneListbox" -->
 
     <tc:separator label="Layout"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Object - Show external content inside of an application"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/00-tinymce/tinymce.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/00-tinymce/tinymce.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/00-tinymce/tinymce.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/00-tinymce/tinymce.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="TinyMCE integration"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/01-ckeditor/ckeditor.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="CKEditor integration"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/wysiwyg-editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/wysiwyg-editor.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/wysiwyg-editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/35-wysiwyg/wysiwyg-editor.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Editor"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="File Upload"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Partial Update (AJAX)"/>
@@ -118,7 +117,7 @@
         <tc:panel id="navTest">
           <tc:gridLayoutConstraint columnSpan="2"/>
 
-          <tx:selectOneChoice fieldId="navSelect" value="#{partialReloadController.navigateAction}" label="On Change">
+          <tc:selectOneChoice fieldId="navSelect" value="#{partialReloadController.navigateAction}" label="On Change">
             <f:facet name="change">
               <tc:command action="#{partialReloadController.navigateAction}" renderedPartially="navTest :page:header:headerInfo"/>
             </f:facet>
@@ -129,7 +128,7 @@
             <f:selectItem itemLabel="Reload parent" itemValue="parent"/>
             <f:selectItem itemLabel="Goto prev" itemValue="prev"/>
             <f:selectItem itemLabel="Goto next" itemValue="next"/>
-          </tx:selectOneChoice>
+          </tc:selectOneChoice>
 
         </tc:panel>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml Fri Sep  4 09:21:08 2015
@@ -17,7 +17,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:c="http://java.sun.com/jsp/jstl/core">
@@ -38,14 +37,14 @@
         </f:facet>
 
         <c:forEach items="#{birdController.birds}" var="bird">
-          <tx:in value="#{bird.size}" label="#{bird.name}"/>
+          <tc:in value="#{bird.size}" label="#{bird.name}"/>
           <tc:button label="Select" action="#{bird.select}"/>
         </c:forEach>
 
         <!--XXX not working with the layout manager-->
         <!--
         <ui:repeat value="#{birdController.birds}" var="bird">
-          <tx:in value="#{bird.size}" label="#{bird.name}"/>
+          <tc:in value="#{bird.size}" label="#{bird.name}"/>
           <tc:button label="Select" action="#{bird.select}"/>
         </ui:repeat>
 -->

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension">
   <ui:param name="title" value="InputSuggest"/>
   <tc:panel>
 
@@ -47,12 +46,12 @@
         <tc:gridLayout columns="300px;*" rows="60px"/>
       </f:facet>
 
-      <tx:in id="suggest"
+      <tc:in id="suggest"
              value="#{inputSuggestController.simpleValue}"
              label="Country"
              tip="search for the given prefix">
         <tc:suggest suggestMethod="#{countries.prefixed}"/>
-      </tx:in>
+      </tc:in>
 
       <tc:out escape="false"
           value="The backend implementation returns a list of countries which &lt;b>starts&lt;/b> with the given charaters."/>
@@ -64,11 +63,11 @@
         <tc:gridLayout columns="300px;*" rows="60px"/>
       </f:facet>
 
-      <tx:in value="#{inputSuggestController.simpleValue}"
+      <tc:in value="#{inputSuggestController.simpleValue}"
              label="Containing"
              tip="search for containing the given string">
         <tc:suggest suggestMethod="#{countries.contains}"/>
-      </tx:in>
+      </tc:in>
 
       <tc:out escape="false"
           value="The backend implementation returns a list of countries which &lt;b>contains&lt;/b> the given charaters."/>
@@ -80,10 +79,10 @@
         <tc:gridLayout columns="300px;*" rows="60px"/>
       </f:facet>
 
-      <tx:in value="#{inputSuggestController.simpleValue}"
+      <tc:in value="#{inputSuggestController.simpleValue}"
              label="Delay">
         <tc:suggest suggestMethod="#{countries.prefixed}" delay="2000"/>
-      </tx:in>
+      </tc:in>
 
       <tc:out escape="false"
           value="Setting the &lt;b>delay='2000'&lt;/b> to wait 2 seconds before making an AJAX request."/>
@@ -95,10 +94,10 @@
         <tc:gridLayout columns="300px;*" rows="60px"/>
       </f:facet>
 
-      <tx:in value="#{inputSuggestController.simpleValue}"
+      <tc:in value="#{inputSuggestController.simpleValue}"
              label="Minimum">
         <tc:suggest suggestMethod="#{countries.prefixed}" minimumCharacters="3"/>
-      </tx:in>
+      </tc:in>
 
       <tc:out escape="false"
           value="Defining the minimal number of charakers before the list will be requested, here with &lt;b>minimumCharacters='3'&lt;/b>."/>
@@ -120,7 +119,7 @@
               <f:facet name="layout">
                 <tc:gridLayout columns="200px;1*"/>
               </f:facet>
-              <tx:in id="isZip" value="#{inputSuggestController.zipValue}"
+              <tc:in id="isZip" value="#{inputSuggestController.zipValue}"
                      label="ZIP/City:"
                      tip="test"
                      suggestMethod="#{inputSuggestController.getZipSuggestItems}"/>
@@ -133,11 +132,11 @@
               <tc:gridLayoutConstraint rowSpan="3"/>
             </tc:panel>
 
-            <tx:selectOneChoice label="State:"
+            <tc:selectOneChoice label="State:"
                                 id="isState"
                 value="#{inputSuggestController.region}">
               <f:selectItems value="#{inputSuggestController.regionItems}"/>
-            </tx:selectOneChoice>
+            </tc:selectOneChoice>
 
             <tc:textarea id="txarea"/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml?rev=1701192&r1=1701191&r2=1701192&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml Fri Sep  4 09:21:08 2015
@@ -19,7 +19,6 @@
 
 <ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
   <ui:param name="title" value="Default Commands"/>
@@ -28,7 +27,7 @@
       <tc:gridLayout rows="60px;3*;3*;*" />
     </f:facet>
 
-    <tx:in label="Last button clicked" readonly="true" value="#{overviewController.lastAction}"/>
+    <tc:in label="Last button clicked" readonly="true" value="#{overviewController.lastAction}"/>
 
     <tc:form id="form-1">
       <tc:panel id="panel-1">
@@ -36,18 +35,18 @@
           <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;*"/>
         </f:facet>
 
-        <tx:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
+        <tc:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
 
-        <tx:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
+        <tc:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
 
-        <tx:date />
+        <tc:date />
 
-        <tx:selectOneChoice>
+        <tc:selectOneChoice>
           <tc:selectItem itemLabel="A" itemValue="A"/>
           <tc:selectItem itemLabel="B" itemValue="B"/>
           <tc:selectItem itemLabel="C" itemValue="C"/>
           <tc:selectItem itemLabel="D" itemValue="D"/>
-        </tx:selectOneChoice>
+        </tc:selectOneChoice>
 
         <tc:button id="default-1" defaultCommand="true" label="default" actionListener="#{overviewController.click}"/>
 
@@ -61,9 +60,9 @@
           <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;*"/>
         </f:facet>
 
-        <tx:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue1}"/>
+        <tc:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue1}"/>
 
-        <tx:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
+        <tc:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
 
         <tc:button id="default-2" defaultCommand="true" label="default" actionListener="#{overviewController.click}"/>