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 2020/07/16 13:36:51 UTC

[myfaces-tobago] branch master updated: TOBAGO-1843: Demo * removing attic stuff

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 43c240e  TOBAGO-1843: Demo * removing attic stuff
43c240e is described below

commit 43c240e3360b5d95137e7e5477721d82d6b4ddc1
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Jul 16 15:36:31 2020 +0200

    TOBAGO-1843: Demo
    * removing attic stuff
---
 .../tobago/example/demo/TestController.java        |   3 +-
 .../tobago/example/test/AbstractDynamicPanel.java  |  43 ---
 .../tobago/example/test/BootstrapController.java   |  57 ---
 .../tobago/example/test/DynamicController.java     |  66 ----
 .../example/test/DynamicPanel1Controller.java      |  38 --
 .../example/test/DynamicPanel2Controller.java      |  47 ---
 .../example/test/DynamicPanel3Controller.java      |  48 ---
 .../tobago/example/test/ErrorController.java       |  35 --
 .../tobago/example/test/HiddenController.java      |  56 ---
 .../myfaces/tobago/example/test/MeasureBean.java   | 100 ------
 .../example/test/MessagesTestController.java       |  48 ---
 .../tobago/example/test/PopupDataController.java   |  38 --
 .../apache/myfaces/tobago/example/test/Reload.java |  55 ---
 .../myfaces/tobago/example/test/ResourceEntry.java |  97 -----
 .../myfaces/tobago/example/test/ResourceType.java  |  25 --
 .../tobago/example/test/ScriptEventController.java |  54 ---
 .../tobago/example/test/ScriptEventItem.java       |  48 ---
 .../tobago/example/test/ScriptEventServlet.java    |  58 ---
 .../tobago/example/test/SheetSortController.java   | 147 --------
 .../tobago/example/test/SheetTestController.java   |  73 ----
 .../tobago/example/test/TreeTestController.java    |  83 -----
 .../example/test/TrueAndFalseListController.java   |  35 --
 .../example/test/UndefinedRowCountDataModel.java   |  37 --
 .../myfaces/tobago/example/test/WaitFilter.java    |  65 ----
 .../tobago/example/test/ZIndexController.java      |  48 ---
 .../webapp/content/40-test/90000-attic/Attic.xhtml |  28 --
 .../90000-attic/error/Throw_Exception.xhtml        |  38 --
 .../90000-attic/forEach/Dynamic_Include.xhtml      |  55 ---
 .../40-test/90000-attic/forEach/x-panel-1.xhtml    |  33 --
 .../40-test/90000-attic/forEach/x-panel-2.xhtml    |  34 --
 .../40-test/90000-attic/forEach/x-panel-3.xhtml    |  34 --
 .../gridLayout/Auto_Vertical_In_In.xhtml           |  42 ---
 .../gridLayout/Constraints_Border.xhtml            |  39 ---
 .../gridLayout/Constraints_Border_Padding.xhtml    |  41 ---
 .../gridLayout/Constraints_Padding.xhtml           |  39 ---
 .../gridLayout/Current_Vs_Preferred_In_Auto.xhtml  |  42 ---
 .../Horizontal_600px_Asterisk_Default.xhtml        |  37 --
 .../Horizontal_600px_Default_300px.xhtml           |  39 ---
 .../Horizontal_600px_Default_Default.xhtml         |  37 --
 .../Horizontal_Default_Default_600px.xhtml         |  39 ---
 .../40-test/90000-attic/gridLayout/Margin.xhtml    |  40 ---
 .../90000-attic/gridLayout/Margin_Fallback.xhtml   |  37 --
 .../40-test/90000-attic/gridLayout/Nested.xhtml    |  81 -----
 .../40-test/90000-attic/gridLayout/Nested_4.xhtml  |  77 ----
 .../90000-attic/gridLayout/Nested_Simple.xhtml     |  45 ---
 .../40-test/90000-attic/gridLayout/Nested_V.xhtml  |  48 ---
 .../40-test/90000-attic/gridLayout/Not_Exact.xhtml |  40 ---
 .../90000-attic/gridLayout/Not_Exact_4x4.xhtml     |  69 ----
 .../gridLayout/Position_10x10_Span.xhtml           | 121 -------
 .../gridLayout/Position_1_1x1_Span.xhtml           |  41 ---
 .../90000-attic/gridLayout/Position_2x2.xhtml      |  43 ---
 .../90000-attic/gridLayout/Position_2x2_Out.xhtml  |  43 ---
 .../gridLayout/Position_2x2_Span_Bottom.xhtml      |  44 ---
 .../gridLayout/Position_2x2_Span_Left.xhtml        |  43 ---
 .../gridLayout/Position_2x2_Span_Right.xhtml       |  43 ---
 .../gridLayout/Position_2x2_Span_Top.xhtml         |  44 ---
 .../gridLayout/Position_4x4_Span_Steps.xhtml       |  69 ----
 .../gridLayout/Proportion_Versus_Minimum.xhtml     |  52 ---
 .../gridLayout/Relative_Inside_Auto_1_1.xhtml      |  63 ----
 .../Relative_Inside_Auto_1_1_Cannot_Match.xhtml    |  63 ----
 .../gridLayout/Relative_Inside_Auto_1_3.xhtml      |  63 ----
 .../Relative_Inside_Auto_2_Columns.xhtml           |  49 ---
 .../gridLayout/Relative_Inside_Auto_2_Rows.xhtml   |  49 ---
 .../gridLayout/Rendered_Auto_2x2_All_But_1.xhtml   |  50 ---
 .../gridLayout/Rendered_Auto_2x2_All_But_2.xhtml   |  50 ---
 .../gridLayout/Rendered_Auto_2x2_All_But_3.xhtml   |  50 ---
 .../gridLayout/Rendered_Auto_2x2_All_But_4.xhtml   |  50 ---
 .../gridLayout/Rendered_Combinations.xhtml         | 285 ---------------
 .../Rendered_Combinations_3_Images_Fragment.xhtml  |  43 ---
 .../gridLayout/Rendered_Pixel_2x2_All_But_1.xhtml  |  42 ---
 .../gridLayout/Rendered_Pixel_2x2_All_But_2.xhtml  |  42 ---
 .../gridLayout/Rendered_Pixel_2x2_All_But_3.xhtml  |  42 ---
 .../gridLayout/Rendered_Pixel_2x2_All_But_4.xhtml  |  42 ---
 .../gridLayout/Rendered_Prop_2x2_All_But_1.xhtml   |  43 ---
 .../gridLayout/Rendered_Prop_2x2_All_But_2.xhtml   |  43 ---
 .../gridLayout/Rendered_Prop_2x2_All_But_3.xhtml   |  43 ---
 .../gridLayout/Rendered_Prop_2x2_All_But_4.xhtml   |  43 ---
 .../40-test/90000-attic/gridLayout/Rigid.xhtml     | 141 --------
 .../gridLayout/Scrolling_2_Levels.xhtml            |  61 ----
 .../90000-attic/gridLayout/Scrolling_Box.xhtml     |  53 ---
 .../90000-attic/gridLayout/Scrolling_Page.xhtml    |  50 ---
 .../90000-attic/gridLayout/Scrolling_Panel.xhtml   |  53 ---
 .../gridLayout/Scrolling_Panel_With_Border.xhtml   |  54 ---
 .../90000-attic/gridLayout/Scrolling_Tab.xhtml     |  58 ---
 .../40-test/90000-attic/gridLayout/Size_Auto.xhtml |  45 ---
 .../90000-attic/gridLayout/Size_Maximum.xhtml      |  40 ---
 .../90000-attic/gridLayout/Size_Minimum.xhtml      |  40 ---
 .../90000-attic/gridLayout/Size_Preferred.xhtml    |  40 ---
 .../40-test/90000-attic/gridLayout/Size_Set.xhtml  |  37 --
 .../90000-attic/gridLayout/Spacing_Nested.xhtml    | 126 -------
 .../90000-attic/gridLayout/Spacing_Simple.xhtml    |  53 ---
 .../90000-attic/gridLayout/TabGroup_Auto.xhtml     |  70 ----
 .../gridLayout/TabGroup_Auto_Auto.xhtml            |  70 ----
 .../90000-attic/gridLayout/TabGroup_Relative.xhtml |  57 ---
 .../90000-attic/gridLayout/Tobago_1243.xhtml       |  52 ---
 .../gridLayout/Too_Less_Components_Empty.xhtml     |  32 --
 .../Too_Less_Components_Horizontal.xhtml           |  37 --
 .../Too_Less_Components_Horizontal_6.xhtml         |  41 ---
 .../gridLayout/Too_Less_Components_Vertical.xhtml  |  37 --
 .../Too_Less_Components_Vertical_6.xhtml           |  41 ---
 .../gridLayout/Too_Much_Components.xhtml           |  43 ---
 .../gridLayout/Transparent_For_Layout.xhtml        |  55 ---
 .../Transparent_For_Layout_Fragment.xhtml          |  29 --
 .../40-test/90000-attic/hidden/Hidden.xhtml        |  62 ----
 .../40-test/90000-attic/label/For_Auto.xhtml       | 118 -------
 .../content/40-test/90000-attic/label/Label.xhtml  |  46 ---
 .../40-test/90000-attic/label/Label_Tx.xhtml       |  40 ---
 .../40-test/90000-attic/markup/Tobago_1215.xhtml   |  44 ---
 .../90000-attic/markup/tobago-1215.selenium.html   |  59 ----
 .../40-test/90000-attic/messages/Messages.xhtml    |  36 --
 .../messages/Messages_Confirmation.xhtml           |  38 --
 .../40-test/90000-attic/object/Object_Full.xhtml   |  44 ---
 .../content/40-test/90000-attic/page/Html.xhtml    |  41 ---
 .../content/40-test/90000-attic/page/Page.xhtml    |  29 --
 .../90000-attic/popup/Popup_Bug_Tobago_1091.xhtml  |  67 ----
 .../90000-attic/popup/Popup_Bug_Tobago_1103.xhtml  |  98 ------
 .../popup/Popup_Close_After_Submit_And_Ajax.xhtml  |  66 ----
 .../90000-attic/popup/Popup_Draggable.xhtml        |  49 ---
 .../40-test/90000-attic/popup/Z_Index.xhtml        | 389 ---------------------
 .../popup/popup-bug-tobago-1091.selenium.html      |  57 ---
 .../popup/popup-bug-tobago-1103.selenium.html      | 157 ---------
 ...popup-close-after-submit-and-ajax.selenium.html |  67 ----
 .../popup/popup-draggable.selenium.html            |  67 ----
 .../content/40-test/90000-attic/reload/Tip.xhtml   |  50 ---
 .../40-test/90000-attic/script/Script_Event.xhtml  |  76 ----
 .../40-test/90000-attic/script/script-event.js     |  37 --
 .../segmentLayout/Buttons_With_Image.xhtml         |  99 ------
 .../90000-attic/segmentLayout/Simple_1.xhtml       |  34 --
 .../90000-attic/segmentLayout/Simple_2.xhtml       |  39 ---
 .../90000-attic/segmentLayout/Simple_3.xhtml       |  44 ---
 .../sheet/Sheet_Auto_Height_Header_Footer.xhtml    | 126 -------
 .../90000-attic/sheet/Sheet_Auto_Height_Rows.xhtml |  99 ------
 .../90000-attic/sheet/Sheet_Auto_Width.xhtml       |  53 ---
 .../90000-attic/sheet/Sheet_Bug_Tobago_1090.xhtml  |  56 ---
 .../40-test/90000-attic/sheet/Sheet_Large.xhtml    |  67 ----
 .../90000-attic/sheet/Sheet_Multi_Header.xhtml     | 104 ------
 .../40-test/90000-attic/sheet/Sheet_Paging_1.xhtml |  37 --
 .../90000-attic/sheet/Sheet_Paging_11.xhtml        |  40 ---
 .../90000-attic/sheet/Sheet_Paging_20.xhtml        |  37 --
 .../40-test/90000-attic/sheet/Sheet_Reload.xhtml   |  55 ---
 .../40-test/90000-attic/sheet/Sheet_Selector.xhtml |  79 -----
 .../40-test/90000-attic/sheet/Sheet_Simple.xhtml   |  44 ---
 .../40-test/90000-attic/sheet/Sheet_Sort.xhtml     |  58 ---
 .../40-test/90000-attic/sheet/Sheet_Tree.xhtml     |  57 ---
 .../sheet/Sheet_Unknown_Row_Count.xhtml            |  41 ---
 .../sheet/Sheet_Without_Columns_Definition.xhtml   |  35 --
 .../sheet/sheet-bug-tobago-1090.selenium.html      |  89 -----
 .../40-test/90000-attic/sheet/sheet-large.js       |  34 --
 .../90000-attic/sheet/sheet-paging-1.selenium.html |  44 ---
 .../sheet/sheet-paging-11.selenium.html            |  44 ---
 .../sheet/sheet-paging-20.selenium.html            |  44 ---
 .../40-test/90000-attic/sheet/sheet-reload.js      |  38 --
 .../90000-attic/sheet/sheet-selector.selenium.html | 354 -------------------
 .../40-test/90000-attic/sheet/sheet-simple.js      |  27 --
 .../90000-attic/sheet/sheet-sort.selenium.html     | 219 ------------
 .../40-test/90000-attic/tabGroup/Client.xhtml      |  57 ---
 .../tabGroup/SelectedIndexWithoutSetter.xhtml      |  36 --
 .../40-test/90000-attic/tabGroup/Simple.xhtml      | 103 ------
 .../tabGroup/TabGroup_Layout_1164.xhtml            |  47 ---
 .../40-test/90000-attic/tree/Tree_Command.xhtml    |  41 ---
 .../40-test/90000-attic/tree/Tree_Expanded.xhtml   |  42 ---
 .../40-test/90000-attic/tree/Tree_Infinite.xhtml   |  46 ---
 .../90000-attic/tree/Tree_Marked_With_Model.xhtml  |  62 ----
 .../tree/Tree_Marked_Without_Model.xhtml           |  60 ----
 .../90000-attic/tree/Tree_Select_Via_State.xhtml   |  50 ---
 .../90000-attic/tree/Tree_Select_Via_Value.xhtml   |  51 ---
 .../90000-attic/tree/Tree_Show_Attributes.xhtml    |  91 -----
 .../40-test/90000-attic/tree/Tree_Simple.xhtml     |  42 ---
 .../90000-attic/tree/tree-expanded.selenium.html   |  72 ----
 .../tree/tree-marked-with-model.selenium.html      |  98 ------
 .../tree/tree-marked-without-model.selenium.html   |  98 ------
 .../90000-attic/tree/tree-select.selenium.html     | 113 ------
 .../type/Measure_Image_With_Constraints.xhtml      | 143 --------
 .../type/Measure_Image_Without_Constraints.xhtml   | 113 ------
 .../example/demo/qunit/AccessAllPagesTest.java     |   1 -
 175 files changed, 1 insertion(+), 10730 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
index 14d9d32..2673651 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
@@ -82,8 +82,7 @@ public class TestController implements Serializable {
     for (final File file : dir.listFiles()) {
       if (file.isDirectory()) {
         xhtmls.addAll(getXHTMLs(file));
-      } else if (!file.getName().startsWith("x-") && file.getName().endsWith(".xhtml")
-          && !file.getPath().contains("content/40-test/90000-attic/")) {
+      } else if (!file.getName().startsWith("x-") && file.getName().endsWith(".xhtml")) {
         xhtmls.add(file.getPath());
       }
     }
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java
deleted file mode 100644
index 4d04a35..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import java.io.Serializable;
-
-public abstract class AbstractDynamicPanel implements Serializable {
-
-  private static final String[] PANEL_FILES = new String[]{
-      "x-panel-1.xhtml",
-      "x-panel-2.xhtml",
-      "x-panel-3.xhtml"};
-
-  private final String name;
-
-  public AbstractDynamicPanel() {
-    final String simpleName = this.getClass().getSimpleName();
-    final int pos = simpleName.length() - 1 - "Controller".length();
-    final int number = Integer.parseInt(simpleName.substring(pos, pos + 1)) - 1;
-    this.name = PANEL_FILES[number];
-  }
-
-  public String getName() {
-    return name;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java
deleted file mode 100644
index 0d176d5..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class BootstrapController implements Serializable {
-
-  private String value;
-
-  public BootstrapController() {
-    reset();
-  }
-
-  public String save() {
-    return "test/html/bootstrap.xhtml";
-  }
-
-  public String delete() {
-    value = null;
-    return "test/html/bootstrap.xhtml";
-  }
-
-  public String reset() {
-    value = "initial value";
-    return "test/html/bootstrap.xhtml";
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(final String value) {
-    this.value = value;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java
deleted file mode 100644
index d2e0d22..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@SessionScoped
-@Named
-public class DynamicController implements Serializable {
-
-  private List<AbstractDynamicPanel> panels = new ArrayList<>();
-
-  public String addPanel() {
-
-    switch (panels.size()) {
-      case 0:
-        panels.add(new DynamicPanel1Controller());
-        break;
-      case 1:
-        panels.add(new DynamicPanel2Controller());
-        break;
-      case 2:
-        panels.add(new DynamicPanel3Controller());
-        break;
-      default:
-        FacesContext.getCurrentInstance().addMessage(null,
-            new FacesMessage(FacesMessage.SEVERITY_WARN, "All panels where added!", null));
-    }
-    return "/test/forEach/dynamic-include.xhtml";
-//    return null;
-  }
-
-  public String reset() {
-    panels.clear();
-    return "/test/forEach/dynamic-include.xhtml";
-//    return null;
-  }
-
-  public List<AbstractDynamicPanel> getPanels() {
-    return panels;
-  }
-
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java
deleted file mode 100644
index 4116299..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-
-@SessionScoped
-@Named
-public class DynamicPanel1Controller extends AbstractDynamicPanel {
-
-  private String value;
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(final String value) {
-    this.value = value;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java
deleted file mode 100644
index 4834f08..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-
-@SessionScoped
-@Named
-public class DynamicPanel2Controller extends AbstractDynamicPanel {
-
-  private String firstName;
-  private String secondName;
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-  public void setFirstName(final String firstName) {
-    this.firstName = firstName;
-  }
-
-  public String getSecondName() {
-    return secondName;
-  }
-
-  public void setSecondName(final String secondName) {
-    this.secondName = secondName;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java
deleted file mode 100644
index 142c590..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class DynamicPanel3Controller extends AbstractDynamicPanel implements Serializable {
-
-  private String street;
-  private String city;
-
-  public String getStreet() {
-    return street;
-  }
-
-  public void setStreet(final String street) {
-    this.street = street;
-  }
-
-  public String getCity() {
-    return city;
-  }
-
-  public void setCity(final String city) {
-    this.city = city;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java
deleted file mode 100644
index 9c16375..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.apache.myfaces.tobago.example.demo.DemoException;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named
-public class ErrorController {
-
-  public String error() {
-    throw new DemoException("This exception is thrown to test error pages");
-  }
-
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java
deleted file mode 100644
index 7e98a9c..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-@RequestScoped
-@Named
-public class HiddenController {
-
-  private String value1 = "value 1";
-  private String value2 = "value 2";
-  private String value3 = "value 3";
-
-  public String getValue1() {
-    return value1;
-  }
-
-  public void setValue1(final String value1) {
-    this.value1 = value1;
-  }
-
-  public String getValue2() {
-    return value2;
-  }
-
-  public void setValue2(final String value2) {
-    this.value2 = value2;
-  }
-
-  public String getValue3() {
-    return value3;
-  }
-
-  public void setValue3(final String value3) {
-    this.value3 = value3;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MeasureBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MeasureBean.java
deleted file mode 100644
index 9d9d5c2..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MeasureBean.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.apache.myfaces.tobago.layout.Measure;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-@Singleton
-@Named
-public class MeasureBean {
-
-  public int getIntWidth() {
-    return 200;
-  }
-
-  public int getIntHeight() {
-    return 95;
-  }
-
-  public Integer getIntegerWidth() {
-    return 250;
-  }
-
-  public Integer getIntegerHeight() {
-    return 95;
-  }
-
-  public Measure getMeasureWidth() {
-    return Measure.valueOf(300);
-  }
-
-  public Measure getMeasureHeight() {
-    return Measure.valueOf(95);
-  }
-
-  public String getStringWidth() {
-    return "350";
-  }
-
-  public String getStringHeight() {
-    return "95";
-  }
-
-  public String getStringPxWidth() {
-    return "400px";
-  }
-
-  public String getStringPxHeight() {
-    return "95px";
-  }
-
-  public long getLongWidth() {
-    return 450L;
-  }
-
-  public long getLongHeight() {
-    return 95L;
-  }
-
-  public Any getAnyWidth() {
-    return new Any("500");
-  }
-
-  public Any getAnyHeight() {
-    return new Any("95");
-  }
-
-  public static class Any {
-
-    private String value;
-
-    public Any(final String value) {
-      this.value = value;
-    }
-
-    @Override
-    public String toString() {
-      return value;
-    }
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java
deleted file mode 100644
index 7058acc..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class MessagesTestController implements Serializable {
-
-  public String createMessages() {
-
-    final FacesContext facesContext = FacesContext.getCurrentInstance();
-    facesContext.addMessage("message1",
-        new FacesMessage(FacesMessage.SEVERITY_INFO, "Info message.", "Example of an info message."));
-    facesContext.addMessage(null,
-        new FacesMessage(FacesMessage.SEVERITY_WARN, "Warn message.", "Example of a warn message."));
-    facesContext.addMessage(null,
-        new FacesMessage(FacesMessage.SEVERITY_ERROR, "Error message.", "Example of an error message."));
-    facesContext.addMessage(null,
-        new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fatal message.", "Example of a fatal message."));
-    facesContext.addMessage(null,
-        new FacesMessage("Message without a severity.", "Example of a message without a severity."));
-
-    return null;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java
deleted file mode 100644
index 263e139..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-@RequestScoped
-@Named
-public class PopupDataController {
-
-  private String value;
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(final String value) {
-    this.value = value;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Reload.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Reload.java
deleted file mode 100644
index 2485dce..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Reload.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class Reload implements Serializable {
-
-  private int counter;
-
-  public boolean isReload() {
-    counter++;
-    return true;
-  }
-
-  public String tick() {
-    counter++;
-    return null;
-  }
-
-  public String reset() {
-    counter = 0;
-    return null;
-  }
-
-  public boolean isOnlyEven() {
-    counter++;
-    return counter % 2 == 0;
-  }
-
-  public int getCounter() {
-    return counter;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceEntry.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceEntry.java
deleted file mode 100644
index 4843e91..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceEntry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.faces.context.FacesContext;
-
-public class ResourceEntry {
-
-  private String name;
-  private String key;
-  private ResourceType type;
-  private boolean valid;
-  private String comment;
-
-  public ResourceEntry(final String name, final ResourceType type, final String comment) {
-    this.name = name;
-    this.type = type;
-    this.comment = comment;
-    assert type == ResourceType.IMAGE;
-  }
-
-  public ResourceEntry(final String name, final String key, final ResourceType type, final String comment) {
-    this.name = name;
-    this.key = key;
-    this.type = type;
-    this.comment = comment;
-    assert type == ResourceType.PROPERTY;
-  }
-
-  public boolean check(final FacesContext facesContext) {
-/*
-    switch (type) {
-      case IMAGE:
-        valid = ResourceManagerUtils.getImageWithPath(facesContext, name) != null;
-        break;
-      case PROPERTY:
-        valid = ResourceManagerUtils.getProperty(facesContext, name, key) != null;
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown type " + type);
-    }
-    return valid;
-*/
-    //XXX RM
-
-    return true;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(final String name) {
-    this.name = name;
-  }
-
-  public ResourceType getType() {
-    return type;
-  }
-
-  public void setType(final ResourceType type) {
-    this.type = type;
-  }
-
-  public boolean isValid() {
-    return valid;
-  }
-
-  public void setValid(final boolean valid) {
-    this.valid = valid;
-  }
-
-  public String getComment() {
-    return comment;
-  }
-
-  public void setComment(final String comment) {
-    this.comment = comment;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceType.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceType.java
deleted file mode 100644
index b275c78..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-public enum ResourceType {
-  IMAGE,
-  PROPERTY
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java
deleted file mode 100644
index 1414536..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@SessionScoped
-@Named
-public class ScriptEventController implements Serializable {
-
-  private List<ScriptEventItem> items = new ArrayList<>();
-
-  public void onLoad() {
-    items.add(new ScriptEventItem("onload"));
-  }
-
-  public void onUnload() {
-    items.add(new ScriptEventItem("onunload"));
-  }
-
-  public void onExit() {
-    items.add(new ScriptEventItem("onexit"));
-  }
-
-  public String action() {
-    items.add(new ScriptEventItem("action"));
-    return null;
-  }
-
-  public List<ScriptEventItem> getItems() {
-    return items;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java
deleted file mode 100644
index d4fd8b8..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventItem.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Date;
-
-public class ScriptEventItem {
-
-  private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  private String name;
-  private Date time;
-
-  public ScriptEventItem(final String name) {
-    this.name = name;
-    this.time = new Date();
-    LOG.info(name);
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public Date getTime() {
-    return time;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java
deleted file mode 100644
index 1441fff..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventServlet.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-
-public class ScriptEventServlet extends HttpServlet {
-
-  private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  @Override
-  protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
-      throws ServletException, IOException {
-    final HttpSession session = request.getSession(false);
-    if (session != null) {
-      final ScriptEventController scriptEvent = (ScriptEventController) session.getAttribute("scriptEvent");
-      if (scriptEvent != null) {
-        final String event = request.getParameter("event");
-        if (event.equals("onload")) {
-          scriptEvent.onLoad();
-        } else if (event.equals("onunload")) {
-          scriptEvent.onUnload();
-        } else if (event.equals("onexit")) {
-          scriptEvent.onExit();
-        } else {
-          LOG.warn("Unknown event");
-        }
-      }
-    }
-    response.getOutputStream().write("done".getBytes());
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
deleted file mode 100644
index 59ec5d9..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.lang.invoke.MethodHandles;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-
-@SessionScoped
-@Named
-public class SheetSortController implements Serializable {
-
-  private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  private List<Entry> list;
-
-  public SheetSortController() {
-    init();
-  }
-
-  private void init() {
-    list = new ArrayList<>();
-    for (int i = 0; i < 26; i++) {
-      list.add(new Entry(i));
-    }
-  }
-
-  public List<Entry> getList() {
-    return list;
-  }
-
-  public static final class Entry {
-
-    private String first;
-    private String second;
-    private String third;
-    private String fourth;
-    private Date fifth;
-    private String sixth;
-
-    private Entry(final int number) {
-      int i = number;
-      this.first = "" + upper(i);
-      i++;
-      this.second = "" + upper(i) + lower(i);
-      i++;
-      this.third = "" + upper(i) + lower(i) + lower(i);
-      i++;
-      this.fourth = "" + upper(i) + lower(i) + lower(i) + lower(i);
-      i++;
-      final String dateString = "2012-02-" + i % 26;
-      try {
-        final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.UK);
-        simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-        this.fifth = simpleDateFormat.parse(dateString);
-      } catch (final ParseException e) {
-        LOG.error("string=" + dateString, e);
-      }
-      i++;
-      this.sixth = "" + upper(i) + lower(i) + lower(i) + lower(i) + lower(i);
-    }
-
-    private char upper(final int i) {
-      return (char) (i % 26 + 'A');
-    }
-
-    private char lower(final int i) {
-      return (char) (i % 26 + 'a');
-    }
-
-    public String getFirst() {
-      return first;
-    }
-
-    public void setFirst(final String first) {
-      this.first = first;
-    }
-
-    public String getSecond() {
-      return second;
-    }
-
-    public void setSecond(final String second) {
-      this.second = second;
-    }
-
-    public String getThird() {
-      return third;
-    }
-
-    public void setThird(final String third) {
-      this.third = third;
-    }
-
-    public String getFourth() {
-      return fourth;
-    }
-
-    public void setFourth(final String fourth) {
-      this.fourth = fourth;
-    }
-
-    public Date getFifth() {
-      return fifth;
-    }
-
-    public void setFifth(final Date fifth) {
-      this.fifth = fifth;
-    }
-
-    public String getSixth() {
-      return sixth;
-    }
-
-    public void setSixth(final String sixth) {
-      this.sixth = sixth;
-    }
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetTestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetTestController.java
deleted file mode 100644
index ee2bc59..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SheetTestController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.apache.myfaces.tobago.example.demo.LocaleEntry;
-import org.apache.myfaces.tobago.example.demo.LocaleList;
-import org.apache.myfaces.tobago.example.demo.SolarObject;
-import org.apache.myfaces.tobago.example.demo.AstroData;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.model.DataModel;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@SessionScoped
-@Named
-public class SheetTestController implements Serializable {
-
-  @Inject
-  private AstroData astroData;
-
-  private List<SolarObject> solarArray;
-  private List<SolarObject> solarArray3;
-  private DataModel undefined;
-  private List<LocaleEntry> localeList;
-
-  @PostConstruct
-  private void init() {
-    solarArray = astroData.findAll().collect(Collectors.toList());
-    solarArray3 = astroData.findAll().limit(3).collect(Collectors.toList());
-    undefined = new UndefinedRowCountDataModel(solarArray);
-    // Create a copy for sorting, because the LocaleList.DATA is not modifiable.
-    localeList = new ArrayList<>(LocaleList.DATA);
-  }
-
-  public List<SolarObject> getSolarArray() {
-    return solarArray;
-  }
-
-  public List<SolarObject> getSolarArray3() {
-    return solarArray3;
-  }
-
-  public List<LocaleEntry> getLocaleList() {
-    return localeList;
-  }
-
-  public DataModel getUndefined() {
-    return undefined;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java
deleted file mode 100644
index c9130f7..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.apache.myfaces.tobago.example.demo.CantorInterval;
-import org.apache.myfaces.tobago.example.demo.CategoryTree;
-import org.apache.myfaces.tobago.example.demo.SmallTree;
-import org.apache.myfaces.tobago.model.ExpandedState;
-import org.apache.myfaces.tobago.model.SelectedState;
-import org.apache.myfaces.tobago.model.TreeDataModel;
-import org.apache.myfaces.tobago.model.TreeNodeDataModel;
-import org.apache.myfaces.tobago.model.TreeState;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import javax.swing.tree.DefaultMutableTreeNode;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class TreeTestController implements Serializable {
-
-  private DefaultMutableTreeNode tree = CategoryTree.createSample();
-
-  private DefaultMutableTreeNode small = SmallTree.createSample();
-
-  private TreeState state = new TreeState(new ExpandedState(1), new SelectedState());
-
-  private TreeDataModel treeInSheet = new TreeNodeDataModel(tree, false, state.getExpandedState());
-
-  private CantorInterval infinite = new CantorInterval();
-
-  public TreeTestController() {
-    state.getExpandedState().expand(tree);
-  }
-
-  public DefaultMutableTreeNode getTree() {
-    return tree;
-  }
-
-  public DefaultMutableTreeNode getSmall() {
-    return small;
-  }
-
-  public TreeDataModel getTreeInSheet() {
-    return treeInSheet;
-  }
-
-  public TreeState getState() {
-    return state;
-  }
-
-  public String openAll() {
-    state.getExpandedState().expandAll();
-    return null;
-  }
-
-  public CantorInterval getInfinite() {
-    return infinite;
-  }
-
-  public Object clearSelected() {
-    state.getSelectedState().clear();
-    return null;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java
deleted file mode 100644
index 61ab6bd..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-import java.util.ArrayList;
-
-@Singleton
-@Named
-public class TrueAndFalseListController extends ArrayList<Boolean> {
-
-  public TrueAndFalseListController() {
-    super(2);
-    add(true);
-    add(false);
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/UndefinedRowCountDataModel.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/UndefinedRowCountDataModel.java
deleted file mode 100644
index 69c562a..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/UndefinedRowCountDataModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.apache.myfaces.tobago.example.demo.SolarObject;
-
-import javax.faces.model.ArrayDataModel;
-import java.util.List;
-
-public class UndefinedRowCountDataModel extends ArrayDataModel<SolarObject> {
-
-  public UndefinedRowCountDataModel(final List<SolarObject> array) {
-    super((SolarObject[]) array.toArray());
-  }
-
-  @Override
-  public int getRowCount() {
-    return -1;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
deleted file mode 100644
index 9962e97..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-
-/**
- * This filter waits for 10 seconds to emulate network or application problems.
- */
-public class WaitFilter implements Filter {
-
-  private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  @Override
-  public void init(final FilterConfig filterConfig) throws ServletException {
-  }
-
-  @Override
-  public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
-      throws IOException, ServletException {
-
-    LOG.info("Start waiting 10000 ms");
-
-    try {
-      Thread.sleep(10000L);
-    } catch (final InterruptedException e) {
-      LOG.error("Can't sleep 10000 ms", e);
-    }
-
-    LOG.info("Continuing...");
-
-    chain.doFilter(request, response);
-  }
-
-  @Override
-  public void destroy() {
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java
deleted file mode 100644
index 01f7cad..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.tobago.example.test;
-
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@SessionScoped
-@Named
-public class ZIndexController implements Serializable {
-
-  private Boolean modal1 = true;
-  private Boolean modal2 = true;
-
-  public Boolean getModal1() {
-    return modal1;
-  }
-
-  public void setModal1(final Boolean modal1) {
-    this.modal1 = modal1;
-  }
-
-  public Boolean getModal2() {
-    return modal2;
-  }
-
-  public void setModal2(final Boolean modal2) {
-    this.modal2 = modal2;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/Attic.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/Attic.xhtml
deleted file mode 100644
index 1ff35b5..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/Attic.xhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition template="/main.xhtml"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
-
-  <span class="#{demo:bootstrapClass('BADGE')} #{demo:bootstrapClass('BADGE_DANGER')}">Warning!</span>
-  <p>Here you will find old test pages, which are move from "test".
-    They have to be integrated to the regular demo, or to be removed.</p>
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/Throw_Exception.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/Throw_Exception.xhtml
deleted file mode 100644
index 975f43b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/Throw_Exception.xhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <tc:box label="Error Test">
-
-      <tc:panel>
-        Please click the button, that will throw an exception!
-      </tc:panel>
-
-      <tc:flowLayout textAlign="right">
-        <tc:button label="Throw an error" action="#{errorController.error}"/>
-      </tc:flowLayout>
-
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/Dynamic_Include.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/Dynamic_Include.xhtml
deleted file mode 100644
index df1b157..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/Dynamic_Include.xhtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view xmlns="http://www.w3.org/1999/xhtml"
-        xmlns:ui="http://java.sun.com/jsf/facelets"
-        xmlns:f="http://java.sun.com/jsf/core"
-        xmlns:h="http://java.sun.com/jsf/html"
-        xmlns:tc="http://myfaces.apache.org/tobago/component"
-        xmlns:c="http://java.sun.com/jsp/jstl/core">
-
-  <tc:page width="800px" height="800px" label="Dynamic Include">
-    <tc:box label="Dynamic Included Panels">
-      <tc:panel>
-        <p>
-          This example demonstrates dynamic includes with Facelets.
-        </p>
-        <p>
-          <b>Important:</b> Use the "panel" variable only in Facelet Tags like ui:include, not in Components!
-        </p>
-        <p>
-          <b>Important:</b> The action has to return a view-id, and not null,
-          So you ensure you get a new view, and no problems with ids.
-        </p>
-        <p>
-          TODO: Automatic test with Selenium!
-        </p>
-      </tc:panel>
-      <tc:messages/>
-      <c:forEach var="panel" items="#{dynamicController.panels}">
-        <ui:include src="#{panel.name}"/>
-      </c:forEach>
-      <tc:flowLayout textAlign="right">
-        <tc:button label="Next" action="#{dynamicController.addPanel}"/>
-        <tc:button label="Reset" immediate="true" action="#{dynamicController.reset}"/>
-      </tc:flowLayout>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml
deleted file mode 100644
index afd1ab4..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<ui:composition
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:tc="http://myfaces.apache.org/tobago/component">
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
-    </f:facet>
-    <tc:separator label="Panel One"/>
-    <tc:in label="Value One" value="#{dynamicPanel1Controller.value}" />
-  </tc:panel>
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml
deleted file mode 100644
index d30757e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<ui:composition
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:tc="http://myfaces.apache.org/tobago/component">
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
-    </f:facet>
-    <tc:separator label="Panel Two"/>
-    <tc:in label="First Name" value="#{dynamicPanel2Controller.firstName}" />
-    <tc:in label="Second Name" value="#{dynamicPanel2Controller.secondName}" />
-  </tc:panel>
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml
deleted file mode 100644
index 21898ee..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<ui:composition
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:tc="http://myfaces.apache.org/tobago/component">
-
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
-    </f:facet>
-    <tc:separator label="Panel Three"/>
-    <tc:in label="Street" value="#{dynamicPanel3Controller.street}" />
-    <tc:in label="City" value="#{dynamicPanel3Controller.city}" />
-  </tc:panel>
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Auto_Vertical_In_In.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Auto_Vertical_In_In.xhtml
deleted file mode 100644
index 43fc5ed..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Auto_Vertical_In_In.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto 1fr"/>
-    </f:facet>
-
-    <tc:in id="in-0" value="0">
-      <!-- <tc:gridLayoutConstraint width="60px" height="30px"/> -->
-    </tc:in>
-    <tc:in id="in-1" value="1"/>
-    <tc:panel/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:in-0', 0, 0, 60, 30);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:in-1', 0, 35, 600, 20);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border.xhtml
deleted file mode 100644
index f8418a1..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="500px" height="500px"/> -->
-
-    <tc:panel id="panel">
-      <!-- <tc:gridLayoutConstraint borderLeft="10px" borderRight="20px" borderTop="30px" borderBottom="40px"/> -->
-      <tc:textarea id="text" 
-                   value="panel has borderLeft='10px' borderRight='20px' borderTop='30px' borderBottom='40px'"/>
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:text', 10, 30, 470, 430);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border_Padding.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border_Padding.xhtml
deleted file mode 100644
index 59ae5d3..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Border_Padding.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="500px" height="500px"/> -->
-
-    <tc:panel id="panel">
-      <tc:gridLayoutConstraint
-          borderLeft="10px" borderRight="20px" borderTop="30px" borderBottom="40px"
-          paddingLeft="50px" paddingRight="60px" paddingTop="70px" paddingBottom="80px"/>
-      <tc:textarea
-          id="text"
-          value="panel has borderLeft='10px' borderRight='20px' borderTop='30px' borderBottom='40px' paddingLeft='50px' paddingRight='60px' paddingTop='70px' paddingBottom='80px'"/>
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:text', 60, 100, 360, 280);"/>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Padding.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Padding.xhtml
deleted file mode 100644
index e3c2d6b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Constraints_Padding.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="500px" height="500px"/> -->
-
-    <tc:panel id="panel">
-      <!-- <tc:gridLayoutConstraint paddingLeft="10px" paddingRight="20px" paddingTop="30px" paddingBottom="40px"/> -->
-      <tc:textarea id="text"
-                   value="panel has paddingLeft='10px' paddingRight='20px' paddingTop='30px' paddingBottom='40px'"/>
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:text', 10, 30, 470, 430);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Current_Vs_Preferred_In_Auto.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Current_Vs_Preferred_In_Auto.xhtml
deleted file mode 100644
index 2245796..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Current_Vs_Preferred_In_Auto.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto" rows="auto"/>
-    </f:facet>
-
-    <tc:button label="looooooooooong">
-      <tc:dataAttribute name="assert-left" value="0"/>
-      <tc:dataAttribute name="assert-top" value="0"/>
-      <tc:dataAttribute name="assert-width" value="128"/>
-      <tc:dataAttribute name="assert-height" value="20"/>
-      <tc:dataAttribute name="assert-epsilon" value="20"/>
-    </tc:button>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Asterisk_Default.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Asterisk_Default.xhtml
deleted file mode 100644
index 59fa725..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Asterisk_Default.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr"/>
-    </f:facet>
-
-    <tc:in id="in" value="Width should be 600px"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertWidth('page:in', 600);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_300px.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_300px.xhtml
deleted file mode 100644
index cb68c73..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_300px.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout/>
-    </f:facet>
-
-    <tc:in id="in" value="Width should be 300px">
-      <!-- <tc:gridLayoutConstraint width="300px"/> -->
-    </tc:in>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertWidth('page:in', 300);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_Default.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_Default.xhtml
deleted file mode 100644
index 3308b2d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_600px_Default_Default.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout/>
-    </f:facet>
-
-    <tc:in id="in" value="Width should be 600px"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertWidth('page:in', 600);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_Default_Default_600px.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_Default_Default_600px.xhtml
deleted file mode 100644
index a2edcbb..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Horizontal_Default_Default_600px.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout/>
-    </f:facet>
-
-    <tc:in id="in" value="Width should be 600px">
-      <!-- <tc:gridLayoutConstraint width="600px"/> -->
-    </tc:in>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertWidth('page:in', 600);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin.xhtml
deleted file mode 100644
index 25cd1f2..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout marginLeft="10" marginTop="20px" marginRight="30" marginBottom="40px"/>
-<!--
-      <tc:gridLayout marginLeft="10" marginTop="20px" marginRight="#{10+20}" marginBottom='#{"40px"}'/>
--->
-    </f:facet>
-
-    <tc:image id="id" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:id', 10, 20, 560, 540);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin_Fallback.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin_Fallback.xhtml
deleted file mode 100644
index b8d4262..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Margin_Fallback.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout margin="50"/>
-    </f:facet>
-
-    <tc:image id="id" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:id', 50, 50, 500, 500);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested.xhtml
deleted file mode 100644
index eab251f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested.xhtml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="100px 205px 1fr 2fr" rows="1fr 1fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="650px" height="310px"/> -->
-
-    <tc:image id="x_5" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="3"/> -->
-    </tc:image>
-
-    <tc:image id="x_6" value="pidgeon-point.jpg"/>
-
-    <tc:image id="x_13" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-
-    <tc:panel id="x_14">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-      <f:facet name="layout">
-        <tc:gridLayout columns="130px 1fr"/>
-      </f:facet>
-      <tc:image id="x_14_a" value="pidgeon-point.jpg"/>
-      <tc:image id="x_14_b" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:panel id="x_7">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 2fr"/>
-      </f:facet>
-      <tc:image id="x_7_a" value="pidgeon-point.jpg"/>
-      <tc:image id="x_7_b" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:panel id="x_10">
-      <f:facet name="layout">
-        <tc:gridLayout columns="4fr 1fr"/>
-      </f:facet>
-      <tc:image id="x_10_a" value="pidgeon-point.jpg"/>
-      <tc:image id="x_10_b" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:image id="x_17" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:x_5', 0, 0, 100, 310);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:x_6', 105, 0, 205, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:x_13', 315, 0, 110, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:x_14', 430, 0, 220, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:x_14_a', 430, 0, 130, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:x_14_b', 565, 0, 85, 205);"/>
-    <!--todo: test the other controls ...-->
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_4.xhtml
deleted file mode 100644
index 5c9bc98..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_4.xhtml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="220px" height="220px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="1fr 1fr" columnSpacing="20px" rowSpacing="20px"/>
-    </f:facet>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr" rows="1fr"/>
-      </f:facet>
-
-      <tc:image id="image-1" value="pidgeon-point.jpg"/>
-
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr" rows="1fr"/>
-      </f:facet>
-
-      <tc:image id="image-2" value="pidgeon-point.jpg"/>
-
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr" rows="1fr"/>
-      </f:facet>
-
-      <tc:image id="image-3" value="pidgeon-point.jpg"/>
-
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr" rows="1fr 1fr"/>
-      </f:facet>
-
-      <tc:image id="image-41" value="pidgeon-point.jpg"/>
-      <tc:image id="image-42" value="pidgeon-point.jpg"/>
-
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 0, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 120, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 120, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-41', 120, 120, 100, 47);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-42', 120, 172, 100, 48);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_Simple.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_Simple.xhtml
deleted file mode 100644
index ff7d82b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_Simple.xhtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="120px" height="180px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr"/>
-    </f:facet>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr" rows="1fr"/>
-      </f:facet>
-
-      <tc:image id="image" value="pidgeon-point.jpg"/>
-
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image', 0, 0, 120, 180);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_V.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_V.xhtml
deleted file mode 100644
index e193ef4..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Nested_V.xhtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="500px" height="500px"/> -->
-
-      <f:facet name="layout">
-        <tc:gridLayout id="page-grid" rows="1fr auto"/>
-      </f:facet>
-
-      <tc:textarea id="textarea"/>
-
-      <tc:panel id="panel">
-        <f:facet name="layout">
-          <tc:gridLayout id="panel-grid" columns="1fr 100px"/>
-        </f:facet>
-        <tc:panel id="cell"/>
-        <tc:button id="button" label="Submit"/>
-      </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:textarea', 0, 0, 500, 475);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:button', 400, 480, 100, 20);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact.xhtml
deleted file mode 100644
index c73b510..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" columnSpacing="0px"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="201px" height="200px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg"/>
-    <tc:image id="image-1" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 100, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 100, 0, 101, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact_4x4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact_4x4.xhtml
deleted file mode 100644
index 9a33752..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Not_Exact_4x4.xhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="6fr 9fr 13fr 2fr" rows="4fr 11fr 10fr 5fr"/>
-    </f:facet>
-    <!-- 211 (prime number) + 15px = 226px -->
-    <!-- <tc:gridLayoutConstraint width="226px" height="226px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg"/>
-    <tc:image id="image-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-3" value="pidgeon-point.jpg"/>
-    <tc:image id="image-4" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-5" value="pidgeon-point.jpg"/>
-    <tc:image id="image-6" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-7" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-8" value="pidgeon-point.jpg"/>
-    <tc:image id="image-9" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 42, 28);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 47, 0, 63, 111);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 115, 0, 111, 28);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 33, 42, 78);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-4', 115, 33, 92, 153);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-5', 212, 33, 14, 78);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-6', 0, 116, 110, 70);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-7', 212, 116, 14, 110);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-8', 0, 191, 42, 35);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-9', 47, 191, 160, 35);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_10x10_Span.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_10x10_Span.xhtml
deleted file mode 100644
index df84645..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_10x10_Span.xhtml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr" columns="1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="1045px" height="1045px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="9"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="9" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="7" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-3" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="7"/> -->
-    </tc:image>
-    <tc:image id="i-4" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="9"/> -->
-    </tc:image>
-    <tc:image id="i-5" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="7"/> -->
-    </tc:image>
-    <tc:image id="i-6" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-7" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-8" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-9" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-10" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-11" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-12" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-13" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-14" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-15" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-16" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-17" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="1" rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-18" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-19" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="7" rowSpan="1"/> -->
-    </tc:image>
-    <tc:image id="i-20" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="9" rowSpan="1"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!--todo-->
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 940);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 105, 0, 940, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 105, 105, 730, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 840, 105, 100, 730);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-4', 945, 105, 100, 940);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-5', 105, 210, 100, 730);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-6', 210, 210, 205, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-7', 420, 210, 100, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-8', 525, 210, 205, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-9', 735, 210, 100, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-10', 210, 315, 205, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-11', 420, 420, 205, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-12', 630, 420, 205, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-13', 210, 525, 205, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-14', 630, 525, 205, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-15', 210, 630, 100, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-16', 315, 630, 205, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-17', 525, 630, 100, 205);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-18', 630, 735, 205, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-19', 210, 840, 730, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-20', 0, 945, 940, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_1_1x1_Span.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_1_1x1_Span.xhtml
deleted file mode 100644
index 6a21f0f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_1_1x1_Span.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="1fr" columns="1fr 1fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="610px" height="300px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 405, 300);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 410, 0, 200, 300);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2.xhtml
deleted file mode 100644
index 7e7c284..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr" columnSpacing="0px" rowSpacing="0px"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 400, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 400, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 400, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 400, 400, 200, 200);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Out.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Out.xhtml
deleted file mode 100644
index 8e5b677..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Out.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-
-    <tc:out id="out-0" 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."/>
-    <tc:out id="out-1" value="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:out id="out-2" value="Aenean ac diam eget mi feugiat pulvinar. Etiam orci. Aliquam nec arcu nec eros ornare pulvinar. Sed nec velit. Ut ut orci."/>
-    <tc:out id="out-3" value="Nulla varius. Maecenas feugiat. Etiam varius ipsum et orci. Ut consectetuer odio sit amet libero. Nulla iaculis adipiscing purus. Maecenas a sed."/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:out-0', 0, 0, 400, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:out-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:out-2', 0, 405, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:out-3', 405, 405, 200, 200);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Bottom.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Bottom.xhtml
deleted file mode 100644
index 8af3c0a..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Bottom.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-    
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 400, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 405, 605, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Left.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Left.xhtml
deleted file mode 100644
index ec0280d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Left.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 400, 605);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 405, 405, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Right.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Right.xhtml
deleted file mode 100644
index f8af2ba..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Right.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 400, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 605);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 405, 400, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Top.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Top.xhtml
deleted file mode 100644
index 65797fc..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_2x2_Span_Top.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-
-    <tc:image id="i-0" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 605, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 0, 405, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 405, 405, 200, 200);"/>
-
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_4x4_Span_Steps.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_4x4_Span_Steps.xhtml
deleted file mode 100644
index b72a11c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Position_4x4_Span_Steps.xhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="6fr 9fr 13fr 2fr" rows="4fr 11fr 10fr 5fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="315px" height="315px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg"/>
-    <tc:image id="image-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-3" value="pidgeon-point.jpg"/>
-    <tc:image id="image-4" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-5" value="pidgeon-point.jpg"/>
-    <tc:image id="image-6" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-7" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-    </tc:image>
-    <tc:image id="image-8" value="pidgeon-point.jpg"/>
-    <tc:image id="image-9" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!--todo-->
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 60, 40);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 65, 0, 90, 155);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 160, 0, 155, 40);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 45, 60, 110);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-4', 160, 45, 130, 215);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-5', 295, 45, 20, 110);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-6', 0, 160, 155, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-7', 295, 160, 20, 155);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-8', 0, 265, 60, 50);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-9', 65, 265, 225, 50);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Proportion_Versus_Minimum.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Proportion_Versus_Minimum.xhtml
deleted file mode 100644
index 103198a..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Proportion_Versus_Minimum.xhtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- todo: support the automatical computed width of the scrollbar -->
-    <!-- <tc:gridLayoutConstraint width="320px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="100px auto 1fr 1fr" columns="300px"/>
-    </f:facet>
-
-    <tc:textarea
-        readonly="true"
-        value="What happens, when a * is in a columns/rows definition, and the space for the * is too low: The column/row size will be set to the minium."/>
-    <tc:image id="image-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-    <tc:image id="image-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-    <tc:image id="image-3" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 0, 105, 300, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 0, 510, 300, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 915, 300, 400);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1.xhtml
deleted file mode 100644
index 60196dd..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1.xhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="1000px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto 1fr" rows="20px 100px 100px 100px 1fr"/>
-    </f:facet>
-
-    <tc:label value="one column with 'auto'"/>
-
-    <tc:label value="one column with '1fr'"/>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr auto"/>
-      </f:facet>
-
-      <tc:textarea id="a1" value="50/100/150">
-        <!-- <tc:gridLayoutConstraint minimumWidth="50px" preferredWidth="100px" maximumWidth="200px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a2" value="200/300/400">
-        <!-- <tc:gridLayoutConstraint minimumWidth="50px" preferredWidth="300px" maximumWidth="400px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a3" value="50/100/200">
-        <!-- <tc:gridLayoutConstraint minimumWidth="50px" preferredWidth="100px" maximumWidth="200px"/> -->
-      </tc:textarea>
-
-    </tc:panel>
-
-    <tc:textarea value="rest"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 25, 510, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 25, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a2', 105, 25, 300, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a3', 410, 25, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1_Cannot_Match.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1_Cannot_Match.xhtml
deleted file mode 100644
index b221719..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_1_Cannot_Match.xhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="1000px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto 1fr" rows="20px 100px 100px 100px 1fr"/>
-    </f:facet>
-
-    <tc:label value="one column with 'auto'"/>
-
-    <tc:label value="one column with '1fr'"/>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr auto"/>
-      </f:facet>
-
-      <tc:textarea id="a1" value="50/100/150">
-        <!-- <tc:gridLayoutConstraint minimumWidth="50px" preferredWidth="100px" maximumWidth="150px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a2" value="200/300/400">
-        <!-- <tc:gridLayoutConstraint minimumWidth="200px" preferredWidth="300px" maximumWidth="400px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a3" value="50/100/200">
-        <!-- <tc:gridLayoutConstraint minimumWidth="50px" preferredWidth="100px" maximumWidth="200px"/> -->
-      </tc:textarea>
-
-    </tc:panel>
-
-    <tc:textarea value="rest"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 25, 510, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 25, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a2', 105, 25, 300, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a3', 410, 25, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_3.xhtml
deleted file mode 100644
index 209c1b9..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_1_3.xhtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="1000px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto 1fr" rows="20px 100px 100px 100px 1fr"/>
-    </f:facet>
-
-    <tc:label value="one column with 'auto'"/>
-
-    <tc:label value="one column with '1fr'"/>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 3fr auto"/>
-      </f:facet>
-
-      <tc:textarea id="a1" value="100/200/300">
-        <!-- <tc:gridLayoutConstraint minimumWidth="100px" preferredWidth="200px" maximumWidth="300px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a2" value="400/500/600">
-        <!-- <tc:gridLayoutConstraint minimumWidth="400px" preferredWidth="500px" maximumWidth="600px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a3" value="100/100/100">
-        <!-- <tc:gridLayoutConstraint minimumWidth="100px" preferredWidth="100px" maximumWidth="100px"/> -->
-      </tc:textarea>
-
-    </tc:panel>
-
-    <tc:textarea value="rest" id="rest"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 25, 810, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 25, 200, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a2', 205, 25, 500, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a3', 710, 25, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Columns.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Columns.xhtml
deleted file mode 100644
index 0736c93..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Columns.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto" rows="auto"/>
-    </f:facet>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr"/>
-      </f:facet>
-
-      <tc:textarea id="a1">
-        <!-- <tc:gridLayoutConstraint width="300px" height="300px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a2"/>
-
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 505, 300);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 0, 300, 300);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a2', 305, 0, 200, 300);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Rows.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Rows.xhtml
deleted file mode 100644
index d42cea4..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Relative_Inside_Auto_2_Rows.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto" rows="auto"/>
-    </f:facet>
-
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout rows="1fr 1fr"/>
-      </f:facet>
-
-      <tc:textarea id="a1">
-        <!-- <tc:gridLayoutConstraint width="300px" height="300px"/> -->
-      </tc:textarea>
-
-      <tc:textarea id="a2"/>
-
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 300, 338);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 0, 300, 300);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a2', 0, 305, 300, 33);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_1.xhtml
deleted file mode 100644
index af935a5..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_1.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto" columns="auto auto"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="200px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="400px" height="200px"/> -->
-    </tc:image>
-    <tc:image id="i-3" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 405, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 405, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_2.xhtml
deleted file mode 100644
index bee8dcd..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_2.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto" columns="auto auto"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="200px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="400px" height="200px"/> -->
-    </tc:image>
-    <tc:image id="i-3" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 0, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 0, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_3.xhtml
deleted file mode 100644
index 2899196..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_3.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto" columns="auto auto"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="200px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="200px"/> -->
-    </tc:image>
-    <tc:image id="i-3" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 0, 0, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_4.xhtml
deleted file mode 100644
index 852cf63..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Auto_2x2_All_But_4.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto" columns="auto auto"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="200px" height="400px"/> -->
-    </tc:image>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="400px" height="200px"/> -->
-    </tc:image>
-    <tc:image id="i-3" value="pidgeon-point.jpg" rendered="false">
-      <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-3');"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations.xhtml
deleted file mode 100644
index f572312..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations.xhtml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="700px" height="310px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout
-          columns="auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto auto"/>
-    </f:facet>
-
-    <!--
-    Any combination of "100px", "auto" and "*" in the rows attribute,
-    for 3 rows are 3 * 3 * 3 = 27 combinations.
-    The 2nd one is rendered = false.
-    -->
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 100px 100px"/>
-      <ui:param name="subid" value="sub-01"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 100px auto"/>
-      <ui:param name="subid" value="sub-02"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 100px 1fr"/>
-      <ui:param name="subid" value="sub-03"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px auto 100px"/>
-      <ui:param name="subid" value="sub-04"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px auto auto"/>
-      <ui:param name="subid" value="sub-05"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px auto 1fr"/>
-      <ui:param name="subid" value="sub-06"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 1fr 100px"/>
-      <ui:param name="subid" value="sub-07"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 1fr auto"/>
-      <ui:param name="subid" value="sub-08"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="100px 1fr 1fr"/>
-      <ui:param name="subid" value="sub-09"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 100px 100px"/>
-      <ui:param name="subid" value="sub-11"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 100px auto"/>
-      <ui:param name="subid" value="sub-12"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 100px 1fr"/>
-      <ui:param name="subid" value="sub-13"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto auto 100px"/>
-      <ui:param name="subid" value="sub-14"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto auto auto"/>
-      <ui:param name="subid" value="sub-15"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto auto 1fr"/>
-      <ui:param name="subid" value="sub-16"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 1fr 100px"/>
-      <ui:param name="subid" value="sub-17"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 1fr auto"/>
-      <ui:param name="subid" value="sub-18"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="auto 1fr 1fr"/>
-      <ui:param name="subid" value="sub-19"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 100px 100px"/>
-      <ui:param name="subid" value="sub-21"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 100px auto"/>
-      <ui:param name="subid" value="sub-22"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 100px 1fr"/>
-      <ui:param name="subid" value="sub-23"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr auto 100px"/>
-      <ui:param name="subid" value="sub-24"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr auto auto"/>
-      <ui:param name="subid" value="sub-25"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr auto 1fr"/>
-      <ui:param name="subid" value="sub-26"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 1fr 100px"/>
-      <ui:param name="subid" value="sub-27"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 1fr auto"/>
-      <ui:param name="subid" value="sub-28"/>
-    </ui:include>
-
-    <ui:include src="rendered-combinations-3-images-fragment.xhtml">
-      <ui:param name="rows" value="1fr 1fr 1fr"/>
-      <ui:param name="subid" value="sub-29"/>
-    </ui:include>
-
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-01:image-1', 0, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-01:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-01:image-3', 0, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-02:image-1', 25, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-02:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-02:image-3', 25, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-03:image-1', 50, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-03:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-03:image-3', 50, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-04:image-1', 75, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-04:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-04:image-3', 75, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-05:image-1', 100, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-05:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-05:image-3', 100, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-06:image-1', 125, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-06:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-06:image-3', 125, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-07:image-1', 150, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-07:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-07:image-3', 150, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-08:image-1', 175, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-08:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-08:image-3', 175, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-09:image-1', 200, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-09:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-09:image-3', 200, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-11:image-1', 225, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-11:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-11:image-3', 225, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-12:image-1', 250, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-12:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-12:image-3', 250, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-13:image-1', 275, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-13:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-13:image-3', 275, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-14:image-1', 300, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-14:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-14:image-3', 300, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-15:image-1', 325, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-15:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-15:image-3', 325, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-16:image-1', 350, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-16:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-16:image-3', 350, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-17:image-1', 375, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-17:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-17:image-3', 375, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-18:image-1', 400, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-18:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-18:image-3', 400, 105, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-19:image-1', 425, 0, 20, 100);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-19:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-19:image-3', 425, 105, 20, 205);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-21:image-1', 450, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-21:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-21:image-3', 450, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-22:image-1', 475, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-22:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-22:image-3', 475, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-23:image-1', 500, 0, 20, 152);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-23:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-23:image-3', 500, 157, 20, 153);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-24:image-1', 525, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-24:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-24:image-3', 525, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-25:image-1', 550, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-25:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-25:image-3', 550, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-26:image-1', 575, 0, 20, 152);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-26:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-26:image-3', 575, 157, 20, 153);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-27:image-1', 600, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-27:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-27:image-3', 600, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-28:image-1', 625, 0, 20, 205);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-28:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-28:image-3', 625, 210, 20, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-29:image-1', 650, 0, 20, 152);"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:sub-29:image-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:sub-29:image-3', 650, 157, 20, 153);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations_3_Images_Fragment.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations_3_Images_Fragment.xhtml
deleted file mode 100644
index 96dd057..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Combinations_3_Images_Fragment.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <f:subview id="#{subid}">
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout rows="#{rows}" columns="20px"/>
-      </f:facet>
-      <tc:image id="image-1" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint preferredHeight="100px"/> -->
-      </tc:image>
-      <tc:image id="image-2" value="pidgeon-point.jpg" rendered="false">
-        <!-- <tc:gridLayoutConstraint preferredHeight="100px"/> -->
-      </tc:image>
-      <tc:image id="image-3" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint preferredHeight="100px"/> -->
-      </tc:image>
-    </tc:panel>
-
-  </f:subview>
-
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_1.xhtml
deleted file mode 100644
index f570f5e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_1.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="400px 200px" columns="400px 200px"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 405, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 405, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_2.xhtml
deleted file mode 100644
index e113389..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_2.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="400px 200px" columns="400px 200px"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 0, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 0, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_3.xhtml
deleted file mode 100644
index 2cf203f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_3.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="400px 200px" columns="400px 200px"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 0, 0, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_4.xhtml
deleted file mode 100644
index 743e306..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Pixel_2x2_All_But_4.xhtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="400px 200px" columns="400px 200px"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg" rendered="false"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-3');"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_1.xhtml
deleted file mode 100644
index 2afdb0b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_1.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 405, 0, 200, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 405, 400, 200);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 405, 200, 200);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_2.xhtml
deleted file mode 100644
index e773f02..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_2.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 0, 400, 605);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 405, 0, 200, 605);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_3.xhtml
deleted file mode 100644
index e2b2531..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_3.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 0, 0, 605, 605);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_4.xhtml
deleted file mode 100644
index 53d3b17..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rendered_Prop_2x2_All_But_4.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="605px" height="605px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="2fr 1fr" columns="2fr 1fr"/>
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg" rendered="false"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg" rendered="false"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-0');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-1');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-2');"/>
-    <tc:script onload="TobagoAssert.assertAbsence('page:i-3');"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rigid.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rigid.xhtml
deleted file mode 100644
index 2a1d1db..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Rigid.xhtml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!--
-    width  =  1 + 5 + 101 + 5 + 101 + 5 + 101 + 5 + 2 = 326
-    height = 21 + 5 +  51 + 5 +  51 + 5 +  51 + 5 + 2 = 196
-    -->
-    <f:facet name="layout">
-      <tc:gridLayout rowSpacing="20px" columns="326px" rows="196px 196px 196px"/>
-    </f:facet>
-
-    <tc:box label="1. All rendered">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr 1fr"/>
-      </f:facet>
-
-      <tc:textarea value="1">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="2">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="3">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-
-      <tc:textarea value="4">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="5">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="6">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-
-      <tc:textarea value="7">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="8">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="9">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-    </tc:box>
-
-    <tc:box label="2. Middle row and column are not rendered.">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr 1fr"/>
-      </f:facet>
-
-      <tc:textarea value="1">
-        <tc:dataAttribute name="assert-width" value="154"/>
-        <tc:dataAttribute name="assert-height" value="79"/>
-      </tc:textarea>
-      <tc:textarea value="2" rendered="false"/>
-      <tc:textarea value="3">
-        <tc:dataAttribute name="assert-width" value="154"/>
-        <tc:dataAttribute name="assert-height" value="79"/>
-      </tc:textarea>
-
-      <tc:textarea value="4" rendered="false"/>
-      <tc:textarea value="5" rendered="false"/>
-      <tc:textarea value="6" rendered="false"/>
-
-      <tc:textarea value="7">
-        <tc:dataAttribute name="assert-width" value="154"/>
-        <tc:dataAttribute name="assert-height" value="79"/>
-      </tc:textarea>
-      <tc:textarea value="8" rendered="false"/>
-      <tc:textarea value="9">
-        <tc:dataAttribute name="assert-width" value="154"/>
-        <tc:dataAttribute name="assert-height" value="79"/>
-      </tc:textarea>
-    </tc:box>
-
-    <tc:box label="3. Like 2. but rigid='true'">
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr 1fr" rigid="true"/>
-      </f:facet>
-
-      <tc:textarea value="1">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="2" rendered="false"/>
-      <tc:textarea value="3">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-
-      <tc:textarea value="4" rendered="false"/>
-      <tc:textarea value="5" rendered="false"/>
-      <tc:textarea value="6" rendered="false"/>
-
-      <tc:textarea value="7">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-      <tc:textarea value="8" rendered="false"/>
-      <tc:textarea value="9">
-        <tc:dataAttribute name="assert-width" value="101"/>
-        <tc:dataAttribute name="assert-height" value="51"/>
-      </tc:textarea>
-    </tc:box>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_2_Levels.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_2_Levels.xhtml
deleted file mode 100644
index 82cf063..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_2_Levels.xhtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <tc:box label="Scrolling test in a box" id="box">
-      <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-      <f:facet name="layout">
-        <tc:gridLayout rows="100px 1fr"/>
-      </f:facet>
-
-      <tc:textarea id="text"/>
-
-
-      <tc:box label="Scrolling test in a box" id="box-2">
-        <f:facet name="layout">
-          <tc:gridLayout rows="100px 1fr"/>
-        </f:facet>
-
-        <tc:textarea id="text-2"/>
-
-        <tc:image id="image-1" value="pidgeon-point.jpg">
-          <!-- <tc:gridLayoutConstraint minimumHeight="600px"/> -->
-        </tc:image>
-
-      </tc:box>
-
-
-    </tc:box>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:box', 0, 0, 300, 600);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 6, 26, 287, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 6, 431, 287, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 6, 836, 287, 400);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Box.xhtml
deleted file mode 100644
index c55d32e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Box.xhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <tc:box label="Scrolling test in a box" id="box">
-      <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto"/>
-      </f:facet>
-
-      <tc:image id="image-1" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-2" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-3" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-
-      <tc:script file="script/tobago-assert.js"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:box', 0, 0, 300, 600);"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:image-1', 6, 26, 287, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-2', 6, 431, 287, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-3', 6, 836, 287, 400);"/>
-
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Page.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Page.xhtml
deleted file mode 100644
index a9d078a..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Page.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page" width="300px" height="600px">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto auto auto"/>
-    </f:facet>
-
-    <tc:image id="image-1" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-    <tc:image id="image-2" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-    <tc:image id="image-3" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page::content', 0, 0, 300, 600);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 0, 0, 300, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-2', 0, 405, 300, 400);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 810, 300, 400);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel.xhtml
deleted file mode 100644
index 0c1f771..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel.xhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <tc:panel id="panel">
-      <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto"/>
-      </f:facet>
-
-      <tc:image id="image-1" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-2" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-3" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-
-      <tc:script file="script/tobago-assert.js"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 300, 600);"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:image-1', 0, 0, 300, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-2', 0, 405, 300, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-3', 0, 810, 300, 400);"/>
-
-    </tc:panel>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel_With_Border.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel_With_Border.xhtml
deleted file mode 100644
index 3aa434d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Panel_With_Border.xhtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <tc:panel id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto"/>
-      </f:facet>
-      <tc:gridLayoutConstraint width="300px" height="600px"
-                               borderLeft="10px" borderRight="10px" borderTop="10px" borderBottom="10px"/>
-
-      <tc:image id="image-1" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-2" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-      <tc:image id="image-3" value="pidgeon-point.jpg">
-        <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-      </tc:image>
-
-      <tc:script file="script/tobago-assert.js"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 300, 600);"/>
-
-      <tc:script onload="TobagoAssert.assertLayout('page:image-1', 10, 10, 280, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-2', 10, 415, 280, 400);"/>
-      <tc:script onload="TobagoAssert.assertLayout('page:image-3', 10, 820, 280, 400);"/>
-
-    </tc:panel>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Tab.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Tab.xhtml
deleted file mode 100644
index 8ca5dcc..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Scrolling_Tab.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-    <tc:tabGroup>
-      <tc:tab label="Scrolling test in a tab" id="tab1">
-        <!-- <tc:gridLayoutConstraint width="300px" height="600px"/> -->
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto auto auto"/>
-        </f:facet>
-
-        <tc:image id="image-1" value="pidgeon-point.jpg">
-          <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-        </tc:image>
-        <tc:image id="image-2" value="pidgeon-point.jpg">
-          <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-        </tc:image>
-        <tc:image id="image-3" value="pidgeon-point.jpg">
-          <!-- <tc:gridLayoutConstraint minimumHeight="400px"/> -->
-        </tc:image>
-
-        <tc:script file="script/tobago-assert.js"/>
-
-        <tc:script onload="TobagoAssert.assertLayout('page:tab1::content', 0, 21, 300, 579);"/>
-
-        <!-- todo: Test result is 4 instead of 6. Why? -->
-        <tc:script onload="TobagoAssert.assertLayout('page:tab1:image-1', 6, 26, 288, 400);"/>
-        <!-- todo: Test result is 4 instead of 6. Why? -->
-        <tc:script onload="TobagoAssert.assertLayout('page:tab1:image-2', 6, 431, 288, 400);"/>
-        <!-- todo: Test result is 4 instead of 6. Why? -->
-        <tc:script onload="TobagoAssert.assertLayout('page:tab1:image-3', 6, 836, 288, 400);"/>
-
-      </tc:tab>
-    </tc:tabGroup>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Auto.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Auto.xhtml
deleted file mode 100644
index eb3633b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Auto.xhtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page" label="Detect size of an image (not yet implemented)">
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto" rows="auto"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="400px" height="400px"/> -->
-
-    <!--todo: not implmented yet-->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="120px" height="180px"/> -->
-    </tc:image>
-
-    <tc:out value="TODO: The values doesn't come directly from the image in the moment."/>
-
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 120, 180);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Maximum.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Maximum.xhtml
deleted file mode 100644
index d49cc38..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Maximum.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint maximumWidth="100px" maximumHeight="100px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Minimum.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Minimum.xhtml
deleted file mode 100644
index 93a6a3c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Minimum.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint minimumWidth="300px" minimumHeight="300px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 300, 300);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Preferred.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Preferred.xhtml
deleted file mode 100644
index b4b649d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Preferred.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto" rows="auto"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint preferredWidth="100px" preferredHeight="100px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Set.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Set.xhtml
deleted file mode 100644
index dd0e9fe..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Size_Set.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="200px" height="200px"/> -->
-
-    <tc:image id="image-0" value="pidgeon-point.jpg">
-      <!-- <tc:gridLayoutConstraint width="120px" height="180px"/> -->
-    </tc:image>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 120, 180);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Nested.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Nested.xhtml
deleted file mode 100644
index 870f4e2..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Nested.xhtml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-  
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <!--
-  Test page for spacing:
-  1. spacing attributes
-  2. theme defaults
-  3. only columnSpacing
-  4. only rowSpacing
-  -->
-
-  <tc:page id="page" label="Spacing Test">
-    <!-- <tc:gridLayoutConstraint width="670px" height="670px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="1fr 1fr" columnSpacing="50px" rowSpacing="50px"/>
-    </f:facet>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr 1fr" rows="1fr 1fr 1fr" columnSpacing="5px" rowSpacing="5px"/>
-      </f:facet>
-
-      <tc:image id="a_NW" value="pidgeon-point.jpg"/>
-      <tc:image id="a_N" value="pidgeon-point.jpg"/>
-      <tc:image id="a_NE" value="pidgeon-point.jpg"/>
-      <tc:image id="a_W" value="pidgeon-point.jpg"/>
-      <tc:image id="a_C" value="pidgeon-point.jpg"/>
-      <tc:image id="a_E" value="pidgeon-point.jpg"/>
-      <tc:image id="a_SW" value="pidgeon-point.jpg"/>
-      <tc:image id="a_S" value="pidgeon-point.jpg"/>
-      <tc:image id="a_SE" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr 1fr" rows="1fr 1fr 1fr"/>
-      </f:facet>
-
-      <tc:image id="b_NW" value="pidgeon-point.jpg"/>
-      <tc:image id="b_N" value="pidgeon-point.jpg"/>
-      <tc:image id="b_NE" value="pidgeon-point.jpg"/>
-      <tc:image id="b_W" value="pidgeon-point.jpg"/>
-      <tc:image id="b_C" value="pidgeon-point.jpg"/>
-      <tc:image id="b_E" value="pidgeon-point.jpg"/>
-      <tc:image id="b_SW" value="pidgeon-point.jpg"/>
-      <tc:image id="b_S" value="pidgeon-point.jpg"/>
-      <tc:image id="b_SE" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr" rows="1fr 1fr" columnSpacing="0px"/>
-      </f:facet>
-
-      <tc:image id="c_NW" value="pidgeon-point.jpg"/>
-      <tc:image id="c_NE" value="pidgeon-point.jpg"/>
-      <tc:image id="c_SW" value="pidgeon-point.jpg"/>
-      <tc:image id="c_SE" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr 1fr" rows="1fr 1fr" rowSpacing="0px"/>
-      </f:facet>
-
-      <tc:image id="d_NW" value="pidgeon-point.jpg"/>
-      <tc:image id="d_NE" value="pidgeon-point.jpg"/>
-      <tc:image id="d_SW" value="pidgeon-point.jpg"/>
-      <tc:image id="d_SE" value="pidgeon-point.jpg"/>
-    </tc:panel>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:a_NW', 0, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_N', 105, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_NE', 210, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_W', 0, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_C', 105, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_E', 210, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_SW', 0, 210, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_S', 105, 210, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:a_SE', 210, 210, 100, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:b_NW', 360, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_N', 465, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_NE', 570, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_W', 360, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_C', 465, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_E', 570, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_SW', 360, 210, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_S', 465, 210, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:b_SE', 570, 210, 100, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:c_NW', 0, 360, 155, 152);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_NE', 155, 360, 155, 152);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_SW', 0, 517, 155, 153);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_SE', 155, 517, 155, 153);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:d_NW', 360, 360, 152, 155);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:d_NE', 517, 360, 153, 155);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:d_SW', 360, 515, 152, 155);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:d_SE', 517, 515, 153, 155);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Simple.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Simple.xhtml
deleted file mode 100644
index 2737d0e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Spacing_Simple.xhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <!--
-  Test page for spacing:
-  1. spacing attributes
-  2. theme defaults
-  3. only columnSpacing
-  4. only rowSpacing
-  -->
-
-  <tc:page id="page" label="Spacing Test">
-    <!-- <tc:gridLayoutConstraint width="310px" height="310px"/> -->
-
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="1fr 1fr" columnSpacing="0px"/>
-    </f:facet>
-
-    <tc:image id="c_NW" value="pidgeon-point.jpg"/>
-    <tc:image id="c_NE" value="pidgeon-point.jpg"/>
-    <tc:image id="c_SW" value="pidgeon-point.jpg"/>
-    <tc:image id="c_SE" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:c_NW', 0, 0, 155, 152);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_NE', 155, 0, 155, 152);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_SW', 0, 157, 155, 153);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:c_SE', 155, 157, 155, 153);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto.xhtml
deleted file mode 100644
index ec45b92..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto.xhtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    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:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto" columns="auto"/>
-    </f:facet>
-
-    <tc:tabGroup id="tabGroup">
-      <tc:tab label="Rows" id="rows">
-        <f:facet name="layout">
-          <tc:gridLayout rows="1fr 1fr"/>
-        </f:facet>
-        <tc:textarea id="a-1">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-        <tc:textarea id="a-2">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-      </tc:tab>
-      <tc:tab label="Columns" id="columns">
-        <f:facet name="layout">
-          <tc:gridLayout columns="1fr 1fr"/>
-        </f:facet>
-        <tc:textarea id="a-3">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-        <tc:textarea id="a-4">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-
-      </tc:tab>
-    </tc:tabGroup>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!-- Todo: gererally all tabs should have the same size? -->
-
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-1', 6, 26, 100, 50);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-2', 6, 81, 100, 50);"/>
-
-    <!--click the tab to display the elements, they can only be measured if they are not hidden.-->
-    <tc:script onload="jQuery(DomUtils.escapeClientId('page:tabGroup')).find('.tobago-tab[data-tobago-tab-group-index=1]').click();"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-3', 6, 26, 100, 50);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-4', 111, 26, 100, 50);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto_Auto.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto_Auto.xhtml
deleted file mode 100644
index 9e6b951..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Auto_Auto.xhtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    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:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto" columns="auto"/>
-    </f:facet>
-
-    <tc:tabGroup id="tabGroup">
-      <tc:tab label="Rows" id="rows">
-        <f:facet name="layout">
-          <tc:gridLayout rows="auto auto"/>
-        </f:facet>
-        <tc:textarea id="a-1">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-        <tc:textarea id="a-2">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-      </tc:tab>
-      <tc:tab label="Columns" id="columns">
-        <f:facet name="layout">
-          <tc:gridLayout columns="auto auto"/>
-        </f:facet>
-        <tc:textarea id="a-3">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-        <tc:textarea id="a-4">
-          <!-- <tc:gridLayoutConstraint width="100px" height="50px"/> -->
-        </tc:textarea>
-
-      </tc:tab>
-    </tc:tabGroup>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!-- Todo: gererally all tabs should have the same size? -->
-
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-1', 6, 26, 100, 50);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-2', 6, 81, 100, 50);"/>
-
-    <!--click the tab to display the elements, they can only be measured if they are not hidden.-->
-    <tc:script onload="jQuery(DomUtils.escapeClientId('page:tabGroup')).find('.tobago-tab[data-tobago-tab-group-index=1]').click();"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-3', 6, 26, 100, 50);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-4', 111, 26, 100, 50);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Relative.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Relative.xhtml
deleted file mode 100644
index aa3b703..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/TabGroup_Relative.xhtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
- 
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    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:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
-    <tc:tabGroup id="tabGroup">
-      <tc:tab label="Rows" id="rows">
-        <f:facet name="layout">
-          <tc:gridLayout rows="1fr 1fr"/>
-        </f:facet>
-        <tc:textarea id="a-1" />
-        <tc:textarea id="a-2" />
-      </tc:tab>
-      <tc:tab label="Columns" id="columns">
-        <f:facet name="layout">
-          <tc:gridLayout columns="1fr 1fr" />
-        </f:facet>
-        <tc:textarea id="a-3" />
-        <tc:textarea id="a-4" />
-      </tc:tab>
-    </tc:tabGroup>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-1', 6, 26, 588, 131);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:rows:a-2', 6, 162, 588, 132);"/>
-
-    <!--click the tab to display the elements, they can only be measured if they are not hidden.-->
-    <tc:script onload="jQuery(DomUtils.escapeClientId('page:tabGroup')).find('.tobago-tab[data-tobago-tab-group-index=1]').click();"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-3', 6, 26, 291, 268);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:columns:a-4', 302, 26, 292, 268);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Tobago_1243.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Tobago_1243.xhtml
deleted file mode 100644
index a193690..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Tobago_1243.xhtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-  <tc:page id="page">
-
-    <f:facet name="layout">
-      <tc:gridLayout rows="50px 1fr 1fr"/>
-    </f:facet>
-
-    <tc:out value="Test, if EL bindings to non initialized beans are not called, when rendererd = false."/>
-
-    <tc:box id="box-1" label="Empty, because rendered=false">
-        <tc:sheet var="row" rendered="false">
-          <tc:column label="Label">
-            <tc:out/>
-          </tc:column>
-        </tc:sheet>
-    </tc:box>
-
-    <tc:box id="box-2" label="A simple box, to test the layout bank assignment">
-      <f:facet name="layout">
-        <tc:gridLayout rows="100px 1fr"/>
-      </f:facet>
-
-      <tc:textarea value="test 1" id="test-1" rendered="false"/>
-      <tc:textarea value="test 2" id="test-2"/>
-    </tc:box>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:test-2', 6, 440, 1011, 321);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Empty.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Empty.xhtml
deleted file mode 100644
index 664b470..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Empty.xhtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
- 
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="100px" height="205px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr 1fr" />
-    </f:facet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal.xhtml
deleted file mode 100644
index 8881785..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-  
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="100px" height="100px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="1fr" />
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 100);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal_6.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal_6.xhtml
deleted file mode 100644
index 24b7da6..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Horizontal_6.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
- 
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="310px" height="100px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr 1fr 1fr 1fr 1fr" rows="1fr" />
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 105, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 210, 0, 100, 100);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical.xhtml
deleted file mode 100644
index de97483..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
- 
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="100px" height="100px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr 1fr" />
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 100);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical_6.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical_6.xhtml
deleted file mode 100644
index 2b9b69d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Less_Components_Vertical_6.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
- 
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="100px" height="310px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr" rows="1fr 1fr 1fr 1fr 1fr 1fr" />
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 0, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 210, 100, 100);"/>
-    
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Much_Components.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Much_Components.xhtml
deleted file mode 100644
index 9696bc8..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Too_Much_Components.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-  
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="205px" height="205px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="1fr" />
-    </f:facet>
-
-    <tc:image id="i-0" value="pidgeon-point.jpg"/>
-    <tc:image id="i-1" value="pidgeon-point.jpg"/>
-    <tc:image id="i-2" value="pidgeon-point.jpg"/>
-    <tc:image id="i-3" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-0', 0, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-1', 105, 0, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-2', 0, 105, 100, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:i-3', 105, 105, 100, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout.xhtml
deleted file mode 100644
index 21a500c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout.xhtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page" width="200px" height="205px">
-    <f:facet name="layout">
-      <tc:gridLayout />
-    </f:facet>
-
-    <!-- style must not be layed out -->
-    <tc:style>/* only a test */</tc:style>
-
-    <!-- script must not be layed out -->
-    <tc:script>/* only a test */</tc:script>
-
-    <ui:include src="transparent-for-layout-fragment.xhtml"/>
-
-    <!-- hidden must not be layed out -->
-    <tc:hidden id="h"/>
-
-    <!-- param must not be layed out -->
-    <f:param id="foo" value="bar"/>
-
-    <!-- debug must not be layed out -->
-    <ui:debug />
-
-    <tc:image id="image-1" value="pidgeon-point.jpg"/>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:image-0', 0, 0, 200, 100);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:image-1', 0, 105, 200, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout_Fragment.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout_Fragment.xhtml
deleted file mode 100644
index a261424..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/gridLayout/Transparent_For_Layout_Fragment.xhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-    <!--
-    The upper <?xml ... &> declaration creates a component, which must not be layed out!
-    -->
-
-<tc:image
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core"
-    id="image-0"
-    value="pidgeon-point.jpg"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/hidden/Hidden.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/hidden/Hidden.xhtml
deleted file mode 100644
index ac05bc1..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/hidden/Hidden.xhtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
-    <tc:out value="Click 'fill' and than 'submit' and check that the 2. field has not modified, because the hidden field 2 has rendered=false"/>
-    
-    <tc:hidden id="h1" value="#{hiddenController.value1}"/>
-    <tc:in label="Value of the hidden field 1 on server"
-           labelWidth="350px" value="#{hiddenController.value1}" disabled="true"/>
-    
-    <tc:hidden id="h2" value="#{hiddenController.value2}" rendered="false"/>
-    <tc:in label="Value of the hidden field 2 on server (rendered=false)"
-           labelWidth="350px" value="#{hiddenController.value2}" disabled="true"/>
-    
-    <tc:hidden id="h3" value="#{hiddenController.value3}" rendered="true"/>
-    <tc:in label="Value of the hidden field 3 on server (rendered=true)"
-           labelWidth="350px" value="#{hiddenController.value3}" disabled="true"/>
-    
-    <tc:button id="fill" label="1. fill hidden fields" onclick="fillHiddenFields();"/>
-    <tc:button label="2. submit hidden fields..."/>
-
-    <tc:panel/>
-    
-    <tc:script>
-
-      function fillHiddenFields() {
-        jQuery('#page\\:h1').val("new " + jQuery('#page\\:h1').val());
-        jQuery('#page\\:h2').val("new " + jQuery('#page\\:h2').val());
-        jQuery('#page\\:h3').val("new " + jQuery('#page\\:h3').val());
-      }
-      
-      // todo: the test code is not full automated
-    </tc:script>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/For_Auto.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/For_Auto.xhtml
deleted file mode 100644
index ada9d80..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/For_Auto.xhtml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto"/>
-    </f:facet>
-    <tc:box label="Related to TOBAGO-1136: for='@auto' attribute">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto auto auto auto auto auto auto auto auto auto auto"/>
-      </f:facet>
-
-      <tc:in label="tx:in" id="in_panel" fieldId="in"/>
-
-      <tc:textarea label="tx:textarea" id="textarea_panel" fieldId="textarea"/>
-
-      <tc:time label="tx:time" id="time_panel" fieldId="time"/>
-
-      <tc:date label="tx:date" id="date_panel" fieldId="date"/>
-
-      <tc:selectBooleanCheckbox label="tx:selectBooleanCheckbox" id="check_panel" fieldId="check"/>
-
-      <tc:selectManyCheckbox label="tx:selectManyCheckbox" id="mcheck_panel" fieldId="mcheck">
-        <tc:selectItem itemLabel="Test 1" itemValue="1"/>
-        <tc:selectItem itemLabel="Test 2" itemValue="2"/>
-      </tc:selectManyCheckbox>
-
-      <tc:selectManyListbox label="tx:selectManyListbox" id="mlist_panel" fieldId="mlist">
-        <tc:selectItem itemLabel="Test"/>
-      </tc:selectManyListbox>
-
-      <tc:selectManyShuttle label="tx:selectManyShuttle" id="shuttle_panel" fieldId="shuttle">
-        <tc:selectItem itemLabel="Test 1"/>
-        <tc:selectItem itemLabel="Test 2"/>
-      </tc:selectManyShuttle>
-
-      <tc:selectOneChoice label="tx:selectOneChoice" id="choice_panel" fieldId="choice">
-        <tc:selectItem itemLabel="Test"/>
-      </tc:selectOneChoice>
-
-      <tc:selectOneListbox label="tx:selectOneListbox" id="list_panel" fieldId="list">
-        <tc:selectItem itemLabel="Test"/>
-      </tc:selectOneListbox>
-
-      <tc:selectOneRadio label="tx:selectOneRadio" id="radio_panel" fieldId="radio">
-        <tc:selectItem itemLabel="Test 1" itemValue="1"/>
-        <tc:selectItem itemLabel="Test 2" itemValue="2"/>
-      </tc:selectOneRadio>
-
-      <tc:file label="tx:file" id="file_panel" fieldId="file"/>
-
-      <tc:panel id="tc_in_panel">
-        <f:facet name="layout">
-          <tc:gridLayout columns="200px 1fr"/>
-        </f:facet>
-
-        <tc:label value="tc:in" for="@auto"/>
-        <tc:in id="tc_in"/>
-      </tc:panel>
-
-    </tc:box>
-
-    <tc:script onload="check()">
-
-      function check() {
-        checkForLabel("page:in_panel", "page:in");
-        checkForLabel("page:textarea_panel", "page:textarea");
-        checkForLabel("page:time_panel", "page:time");
-        checkForLabel("page:date_panel", "page:date");
-        checkForLabel("page:check_panel", "page:check");
-        checkForLabel("page:mcheck_panel", "page:mcheck");
-        checkForLabel("page:mlist_panel", "page:mlist");
-        checkForLabel("page:shuttle_panel", "page:shuttle");
-        checkForLabel("page:choice_panel", "page:choice");
-        checkForLabel("page:list_panel", "page:list");
-        checkForLabel("page:radio_panel", "page:radio");
-        checkForLabel("page:file_panel", "page:file");
-        checkForLabel("page:tc_in_panel", "page:tc_in");
-      }
-
-      function checkForLabel(labelId, componentId) {
-        var label = jQuery(Tobago.Utils.escapeClientId(labelId)).children("label");
-        var component = jQuery(Tobago.Utils.escapeClientId(componentId));
-        if (label.size() != 1) {
-          LOG.error("Label not found with id: '" + labelId + "'");
-        }
-        if (component.size() != 1) {
-          LOG.error("Component not found with id: '" + componentId + "'");
-        }
-        if (label.attr('for') != component.attr('id')) {
-          LOG.error("Missing for attribute for component with id: '" + componentId + "'");
-        }
-      }
-
-    </tc:script>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label.xhtml
deleted file mode 100644
index 383322e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label.xhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto 1fr" rows="auto"/>
-    </f:facet>
-
-    <tc:label value="Label"/>
-    <tc:in value="In"/>
-
-    <tc:panel>
-    <f:facet name="layout">
-    <tc:gridLayout columns="170px 1fr" rows="50px" border="0" />
-    </f:facet>
-    <tc:panel>
-    <tc:label value="Very very very very long label that is very long">
-        <tc:out value="XXX"/>
-      </tc:label>
-    </tc:panel>
-    </tc:panel>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label_Tx.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label_Tx.xhtml
deleted file mode 100644
index 452219f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/label/Label_Tx.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <!-- todo: facelet not working yet TOBAGO-993 -->
-
-    <tc:label value="label">
-      <tc:in value="value"/>
-    </tc:label>
-
-    <tc:out value="tx:label should not be used directly, because it is not working with facelets, only with JSP" />
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/Tobago_1215.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/Tobago_1215.xhtml
deleted file mode 100644
index 47b683b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/Tobago_1215.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-  <tc:page id="page" width="300px" height="600px">
-    <tc:panel id="panel">
-
-      <f:facet name="layout">
-        <tc:gridLayout rows="50px auto auto auto auto" />
-      </f:facet>
-
-      <tc:out value="An image with the preferred height of 200, to test Bug TOBAGO-1215. The test is successful, if the image has the same height of 200 after the reload."/>
-
-      <tc:image markup="double" value="pidgeon-point.jpg" id="image"/>
-
-      <tc:in label="Counter" fieldId="counter" value="#{reload.counter}" readonly="true"/>
-
-      <tc:button label="Reload (AJAX)" id="button" action="#{reload.tick}">
-        <f:ajax render="panel" execute="panel"/>
-      </tc:button>
-
-      <tc:button label="Reset Counter" action="#{reload.reset}"/>
-
-    </tc:panel>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/tobago-1215.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/tobago-1215.selenium.html
deleted file mode 100644
index 4342922..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/markup/tobago-1215.selenium.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/markup/tobago-1215.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertElementHeight</td>
-	<td>//img</td>
-	<td>200</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:button</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForValue</td>
-	<td>page:counter</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>assertElementHeight</td>
-	<td>//img</td>
-	<td>200</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages.xhtml
deleted file mode 100644
index 06a9308..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages.xhtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto 1fr auto"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
-    <tc:messages/>
-    <tc:textarea required="true"/>
-    <tc:button label="submit"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages_Confirmation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages_Confirmation.xhtml
deleted file mode 100644
index 67883bb..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/messages/Messages_Confirmation.xhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <tc:box label="Messages must be confirmed here">
-      <f:facet name="layout">
-        <tc:gridLayout rows="1fr 1fr"/>
-      </f:facet>
-
-      <tc:messages id="mymessages" confirmation="true"/>
-
-      <tc:button label="Please click to show the messages" action="#{messagesTestController.createMessages}"/>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/object/Object_Full.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/object/Object_Full.xhtml
deleted file mode 100644
index 640d3fe..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/object/Object_Full.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <tc:object src="http://www.apache.org/"/>
-
-    <tc:script>
-
-      /* XXX This is a one possible workaround to make the content resizable.
-       * XXX We may find a better solution (e. g. partially switch off layout)
-       */
-
-      jQuery(function () {
-        jQuery("form").css("width", "100%");
-        jQuery("form").css("height", "100%");
-        jQuery(".tobago-page-content").css("width", "100%");
-        jQuery(".tobago-page-content").css("height", "100%");
-        jQuery("iframe").css("width", "100%");
-        jQuery("iframe").css("height", "100%");
-      });
-    </tc:script>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Html.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Html.xhtml
deleted file mode 100644
index 1c7532d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Html.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    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="http://www.w3.org/1999/xhtml">
-
-  <tc:page>
-
-    <ol>
-      <li>
-        One
-      </li>
-      <li>
-        Two
-      </li>
-      <li>
-        Three
-      </li>
-    </ol>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Page.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Page.xhtml
deleted file mode 100644
index 957afa4..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/page/Page.xhtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <tc:textarea value="this is to test the size"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1091.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1091.xhtml
deleted file mode 100644
index c45232d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1091.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page width="800px" height="300px" id="page">
-
-    <tc:box label="TOBAGO-1091">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto 1fr auto auto auto"/>
-      </f:facet>
-      <tc:link
-          label="Bug-Tracking: TOBAGO-1091" link="https://issues.apache.org/jira/browse/TOBAGO-1091"/>
-      <tc:out escape="false" value="Close popup with defaultCommand uncheckes a checkbox on main page.
-      &lt;br/>Checklist:
-      &lt;ol>
-      &lt;li>Check: checkbox is checked&lt;/li>
-      &lt;li>Click on the open button&lt;/li>
-      &lt;li>Click on the close button&lt;/li>
-      &lt;li>Check: checkbox is checked&lt;/li>
-      &lt;/ol>"/>
-
-      <tc:in label="Input" value="test" fieldId="in"/>
-      <tc:selectBooleanCheckbox label="Checkbox" value="true" fieldId="check"/>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout columns="auto 1fr"/>
-        </f:facet>
-        <tc:button label="Open Popup" id="open">
-          <f:facet name="popup">
-            <tc:popup width="100px" height="100px" id="popup">
-              <tc:box label="Popup" id="box">
-                <f:facet name="layout">
-                  <tc:gridLayout rows="1fr auto"/>
-                </f:facet>
-                <tc:panel/>
-                <tc:button label="Close" id="close" defaultCommand="true">
-                  <tc:attribute name="popupClose" value="afterSubmit"/>
-                </tc:button>
-              </tc:box>
-            </tc:popup>
-          </f:facet>
-        </tc:button>
-      </tc:panel>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1103.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1103.xhtml
deleted file mode 100644
index 6fbe030..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Bug_Tobago_1103.xhtml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page width="600px" height="350px" id="page">
-
-    <f:facet name="layout">
-      <tc:gridLayout margin="100px"/>
-    </f:facet>
-
-    <tc:box label="Page">
-      <f:facet name="layout">
-        <tc:gridLayout rows="1fr auto"/>
-      </f:facet>
-      <tc:out value="Test: Open all popups (also the date picker). Then try to close all."/>
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout columns="auto 1fr"/>
-        </f:facet>
-        <tc:button label="Open Popup (AJAX)" id="open-0">
-          <f:ajax render="popup-1" execute="popup-1"/>
-          <f:facet name="popup">
-            <tc:popup width="400px" height="150px" left="150px" top="150px" id="popup-1">
-              <tc:box label="Popup Level 1" id="box-1">
-                <f:facet name="layout">
-                  <tc:gridLayout rows="auto auto 1fr auto"/>
-                </f:facet>
-                <tc:panel>
-                  <f:facet name="layout">
-                    <tc:gridLayout columns="1fr 1fr 1fr 1fr"/>
-                  </f:facet>
-                  <tc:button label="Open Sub Popup (AJAX)" id="open-1">
-                    <f:ajax render="popup-2" execute="popup-2"/>
-                    <f:facet name="popup">
-                      <tc:popup width="400px" height="150px" left="200px" top="200px" id="popup-2">
-                        <tc:box label="Popup Level 2" id="box-2">
-                          <f:facet name="layout">
-                            <tc:gridLayout rows="auto auto"/>
-                          </f:facet>
-                          <tc:date label="Date" id="txdate" fieldId="date" pickerId="picker" formId="form">
-                            <f:convertDateTime pattern="dd/MM/yyyy"/>
-                          </tc:date>
-                          <tc:button label="Open Sub Popup (AJAX)" id="open-2">
-                            <f:ajax render="popup-3" execute="popup-3"/>
-                            <f:facet name="popup">
-                              <tc:popup modal="false" width="200px" height="53px" left="250px" top="250px" id="popup-3">
-                                <tc:box label="Popup Level 3 (non modal)" id="box-3">
-                                  <f:facet name="layout">
-                                    <tc:gridLayout rows="auto 1fr"/>
-                                  </f:facet>
-                                  <tc:button label="Cancel" id="close-3">
-                                    <tc:attribute name="popupClose" value="immediate"/>
-                                  </tc:button>
-                                  <tc:panel/>
-                                </tc:box>
-                              </tc:popup>
-                            </f:facet>
-                          </tc:button>
-                          <tc:button label="Cancel" id="close-2">
-                            <tc:attribute name="popupClose" value="immediate"/>
-                          </tc:button>
-                          <tc:panel/>
-                        </tc:box>
-                      </tc:popup>
-                    </f:facet>
-                  </tc:button>
-                  <tc:button label="Cancel" id="close-1">
-                    <tc:attribute name="popupClose" value="immediate"/>
-                  </tc:button>
-                </tc:panel>
-              </tc:box>
-            </tc:popup>
-          </f:facet>
-        </tc:button>
-      </tc:panel>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Close_After_Submit_And_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Close_After_Submit_And_Ajax.xhtml
deleted file mode 100644
index e9c4bbd..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Close_After_Submit_And_Ajax.xhtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page width="800px" height="300px" id="page">
-
-    <tc:box label="Popup close after submit and AJAX" id="global">
-      <f:facet name="layout">
-        <tc:gridLayout rows="1fr auto auto"/>
-      </f:facet>
-      <tc:out escape="false" value="Test: Close popup partially after the submit.
-      &lt;br/>Checklist:
-      &lt;ol>
-      &lt;li>Check the Readonly Value&lt;/li>
-      &lt;li>Click on the OPEN button&lt;/li>
-      &lt;li>Edit the value in the popup&lt;/li>
-      &lt;li>Click on the SAVE button&lt;/li>
-      &lt;li>Check if popup is closed (&lt;b>fails in the moment!!! The popup wouldn't close&lt;/b>)&lt;/li>
-      &lt;li>Check if the readonly value has been changed&lt;/li>
-      &lt;/ol>"/>
-
-      <tc:in label="Readonly Value" value="#{popupDataController.value}" readonly="true" fieldId="readonly"/>
-
-      <tc:panel>
-        <f:facet name="layout">
-          <tc:gridLayout columns="auto 1fr"/>
-        </f:facet>
-        <tc:button label="Open Popup" id="open">
-          <f:facet name="popup">
-            <tc:popup width="200px" height="100px" id="popup">
-              <tc:box label="Popup" id="box">
-                <f:facet name="layout">
-                  <tc:gridLayout rows="1fr auto"/>
-                </f:facet>
-                <tc:in label="Edit Value" value="#{popupDataController.value}" fieldId="in"/>
-                <tc:button label="Save and Close" id="close">
-                  <f:ajax render=":page:global" execute=":page:global"/>
-                  <tc:attribute name="popupClose" value="afterSubmit"/>
-                </tc:button>
-              </tc:box>
-            </tc:popup>
-          </f:facet>
-        </tc:button>
-      </tc:panel>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Draggable.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Draggable.xhtml
deleted file mode 100644
index a5e6499..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Popup_Draggable.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page width="800px" height="300px" id="page">
-
-    <tc:box label="Popup draggable">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto 1fr auto auto auto"/>
-      </f:facet>
-
-      <tc:button label="Open Popup" id="open">
-        <f:facet name="popup">
-          <tc:popup width="100px" height="100px" id="popup">
-            <tc:box label="Popup" id="box">
-              <f:facet name="layout">
-                <tc:gridLayout rows="1fr auto"/>
-              </f:facet>
-              <tc:panel/>
-              <tc:button label="Close" id="close" defaultCommand="true">
-                <tc:attribute name="popupClose" value="afterSubmit"/>
-              </tc:button>
-            </tc:box>
-          </tc:popup>
-        </f:facet>
-      </tc:button>
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Z_Index.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Z_Index.xhtml
deleted file mode 100644
index 61b1e0e..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/Z_Index.xhtml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-<tc:page width="800px" height="600px" id="page">
-<f:facet name="menuBar">
-<tc:bar>
-<tc:link label="space -> space -> space"/>
-
-<tc:link label="Help">
-<tc:link label="Help 1">
-  <tc:link label="Help 1 1">
-  </tc:link>
-  <tc:separator/>
-  <tc:link label="Help 1 2">
-  </tc:link>
-  <tc:link label="Help 1 3">
-  </tc:link>
-  <tc:link label="Help 1 4">
-  </tc:link>
-  <tc:separator/>
-  <tc:link label="Help 1 5">
-  </tc:link>
-  <tc:link label="Help 1 6">
-  </tc:link>
-  <tc:link label="Help 1 7">
-  </tc:link>
-  <tc:separator/>
-  <tc:link label="Help 1 8">
-  </tc:link>
-  <tc:link label="Help 1 9">
-  </tc:link>
-  <tc:link label="Help 1 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 2">
-  <tc:link label="Help 2 1">
-  </tc:link>
-  <tc:link label="Help 2 2">
-  </tc:link>
-  <tc:link label="Help 2 3">
-  </tc:link>
-  <tc:link label="Help 2 4">
-  </tc:link>
-  <tc:link label="Help 2 5">
-  </tc:link>
-  <tc:link label="Help 2 6">
-  </tc:link>
-  <tc:link label="Help 2 7">
-  </tc:link>
-  <tc:link label="Help 2 8">
-  </tc:link>
-  <tc:link label="Help 2 9">
-  </tc:link>
-  <tc:link label="Help 2 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 3">
-  <tc:link label="Help 3 1">
-  </tc:link>
-  <tc:link label="Help 3 2">
-  </tc:link>
-  <tc:link label="Help 3 3">
-  </tc:link>
-  <tc:link label="Help 3 4">
-  </tc:link>
-  <tc:link label="Help 3 5">
-  </tc:link>
-  <tc:link label="Help 3 6">
-  </tc:link>
-  <tc:link label="Help 3 7">
-  </tc:link>
-  <tc:link label="Help 3 8">
-  </tc:link>
-  <tc:link label="Help 3 9">
-  </tc:link>
-  <tc:link label="Help 3 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 4">
-  <tc:link label="Help 4 1">
-  </tc:link>
-  <tc:link label="Help 4 2">
-  </tc:link>
-  <tc:link label="Help 4 3">
-  </tc:link>
-  <tc:link label="Help 4 4">
-  </tc:link>
-  <tc:link label="Help 4 5">
-  </tc:link>
-  <tc:link label="Help 4 6">
-  </tc:link>
-  <tc:link label="Help 4 7">
-  </tc:link>
-  <tc:link label="Help 4 8">
-  </tc:link>
-  <tc:link label="Help 4 9">
-  </tc:link>
-  <tc:link label="Help 4 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 5">
-  <tc:link label="Help 5 1">
-  </tc:link>
-  <tc:link label="Help 5 2">
-  </tc:link>
-  <tc:link label="Help 5 3">
-  </tc:link>
-  <tc:link label="Help 5 4">
-  </tc:link>
-  <tc:link label="Help 5 5">
-  </tc:link>
-  <tc:link label="Help 5 6">
-  </tc:link>
-  <tc:link label="Help 5 7">
-  </tc:link>
-  <tc:link label="Help 5 8">
-  </tc:link>
-  <tc:link label="Help 5 9">
-  </tc:link>
-  <tc:link label="Help 5 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 6">
-  <tc:link label="Help 6 1">
-  </tc:link>
-  <tc:link label="Help 6 2">
-  </tc:link>
-  <tc:link label="Help 6 3">
-  </tc:link>
-  <tc:link label="Help 6 4">
-  </tc:link>
-  <tc:link label="Help 6 5">
-  </tc:link>
-  <tc:link label="Help 6 6">
-  </tc:link>
-  <tc:link label="Help 6 7">
-  </tc:link>
-  <tc:link label="Help 6 8">
-  </tc:link>
-  <tc:link label="Help 6 9">
-  </tc:link>
-  <tc:link label="Help 6 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 7">
-  <tc:link label="Help 7 1">
-  </tc:link>
-  <tc:link label="Help 7 2">
-  </tc:link>
-  <tc:link label="Help 7 3">
-  </tc:link>
-  <tc:link label="Help 7 4">
-  </tc:link>
-  <tc:link label="Help 7 5">
-  </tc:link>
-  <tc:link label="Help 7 6">
-  </tc:link>
-  <tc:link label="Help 7 7">
-  </tc:link>
-  <tc:link label="Help 7 8">
-  </tc:link>
-  <tc:link label="Help 7 9">
-  </tc:link>
-  <tc:link label="Help 7 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 8">
-  <tc:link label="Help 8 1">
-  </tc:link>
-  <tc:link label="Help 8 2">
-  </tc:link>
-  <tc:link label="Help 8 3">
-  </tc:link>
-  <tc:link label="Help 8 4">
-  </tc:link>
-  <tc:link label="Help 8 5">
-  </tc:link>
-  <tc:link label="Help 8 6">
-  </tc:link>
-  <tc:link label="Help 8 7">
-  </tc:link>
-  <tc:link label="Help 8 8">
-  </tc:link>
-  <tc:link label="Help 8 9">
-  </tc:link>
-  <tc:link label="Help 8 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 9">
-  <tc:link label="Help 9 1">
-  </tc:link>
-  <tc:link label="Help 9 2">
-  </tc:link>
-  <tc:link label="Help 9 3">
-  </tc:link>
-  <tc:link label="Help 9 4">
-  </tc:link>
-  <tc:link label="Help 9 5">
-  </tc:link>
-  <tc:link label="Help 9 6">
-  </tc:link>
-  <tc:link label="Help 9 7">
-  </tc:link>
-  <tc:link label="Help 9 8">
-  </tc:link>
-  <tc:link label="Help 9 9">
-  </tc:link>
-  <tc:link label="Help 9 10">
-  </tc:link>
-</tc:link>
-<tc:link label="Help 10">
-  <tc:link label="Help 10 1">
-  </tc:link>
-  <tc:link label="Help 10 2">
-  </tc:link>
-  <tc:link label="Help 10 3">
-  </tc:link>
-  <tc:link label="Help 10 4">
-  </tc:link>
-  <tc:link label="Help 10 5">
-  </tc:link>
-  <tc:link label="Help 10 6">
-  </tc:link>
-  <tc:link label="Help 10 7">
-  </tc:link>
-  <tc:link label="Help 10 8">
-  </tc:link>
-  <tc:link label="Help 10 9">
-  </tc:link>
-  <tc:link label="Help 10 10">
-  </tc:link>
-</tc:link>
-</tc:link>
-</tc:bar>
-
-</f:facet>
-
-<tc:box label="Page (z-index = 0)">
-  <f:facet name="layout">
-    <tc:gridLayout rows="60px auto auto 1fr auto auto"/>
-  </f:facet>
-  <tc:out
-      value="This page is to check, if the layered presentation is corret. It will be usually defined by setting
-           the z-index in CSS or by the order of rendering in the document. The footer and header of the sheet
-           also have the z-index set in the common renderer."/>
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 4fr"/>
-    </f:facet>
-
-    <tc:link label="Link to Apache" link="http://www.apache.org/"/>
-    <tc:date label="Date">
-      <f:convertDateTime pattern="dd/MM/yyyy"/>
-    </tc:date>
-  </tc:panel>
-  <tc:selectOneChoice>
-    <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
-    <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
-    <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
-  </tc:selectOneChoice>
-  <tc:sheet var="v1" columns="1fr 1fr 1fr" showRowRange="left" showPageRange="right" showDirectLinks="center">
-    <tc:column label="Column 1"/>
-    <tc:column label="Column 2"/>
-    <tc:column label="Column 3"/>
-  </tc:sheet>
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr"/>
-    </f:facet>
-    <tc:selectBooleanCheckbox label="1st Popup Modal" value="#{zIndexController.modal1}" id="modal1st"/>
-    <tc:panel/>
-    <tc:selectBooleanCheckbox label="2nd Popup Modal" value="#{zIndexController.modal2}"/>
-    <tc:panel/>
-  </tc:panel>
-  <tc:panel>
-    <f:facet name="layout">
-      <tc:gridLayout columns="auto auto auto 1fr"/>
-    </f:facet>
-    <tc:button label="Open Popup">
-      <f:facet name="popup">
-        <tc:popup width="600px" height="470px" left="100px" top="100px" id="popup-1" modal="#{zIndexController.modal1}">
-          <tc:box label="Popup (z-index = 1 (TODO))" id="box-1">
-            <f:facet name="layout">
-              <tc:gridLayout rows="auto auto 1fr auto"/>
-            </f:facet>
-            <tc:date label="Date">
-              <f:convertDateTime pattern="dd/MM/yyyy"/>
-            </tc:date>
-            <tc:selectOneChoice>
-              <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
-              <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
-              <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
-            </tc:selectOneChoice>
-            <tc:sheet var="v1" columns="1fr 1fr 1fr" showRowRange="left" showPageRange="right" showDirectLinks="center">
-              <tc:column label="Column 1"/>
-              <tc:column label="Column 2"/>
-              <tc:column label="Column 3"/>
-            </tc:sheet>
-            <tc:panel>
-              <f:facet name="layout">
-                <tc:gridLayout columns="1fr 1fr 1fr 1fr"/>
-              </f:facet>
-              <tc:button label="Open Sub Popup">
-                <f:facet name="popup">
-                  <tc:popup width="400px" height="500px" left="200px" top="50px" id="popup-2" modal="#{zIndexController.modal2}">
-                    <tc:box label="Popup (z-index = 2 (TODO))" id="box-2">
-                      <f:facet name="layout">
-                        <tc:gridLayout rows="auto auto 1fr auto"/>
-                      </f:facet>
-                      <tc:date label="Date">
-                        <f:convertDateTime pattern="dd/MM/yyyy"/>
-                      </tc:date>
-                      <tc:selectOneChoice>
-                        <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
-                        <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
-                        <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
-                      </tc:selectOneChoice>
-                      <tc:sheet var="v1" columns="1fr 1fr 1fr" showRowRange="left" showPageRange="right"
-                                showDirectLinks="center">
-                        <tc:column label="Column 1"/>
-                        <tc:column label="Column 2"/>
-                        <tc:column label="Column 3"/>
-                      </tc:sheet>
-                      <tc:panel>
-                        <f:facet name="layout">
-                          <tc:gridLayout columns="1fr 1fr 1fr"/>
-                        </f:facet>
-                        <tc:button label="Cancel">
-                          <tc:attribute name="popupClose" value="immediate"/>
-                        </tc:button>
-                        <tc:button label="Redisplay">
-                          <f:ajax render="box-2" execute="box-2"/>
-                        </tc:button>
-                        <tc:button label="Ok">
-                          <tc:attribute name="popupClose" value="afterSubmit"/>
-                        </tc:button>
-                      </tc:panel>
-                    </tc:box>
-                  </tc:popup>
-                </f:facet>
-              </tc:button>
-              <tc:button label="Open Popup (AJAX)">
-                <f:ajax render="popup-2" execute="popup-2"/>
-                <tc:popupReference for="popup-2"/>
-              </tc:button>
-              <tc:button label="Cancel">
-                <tc:attribute name="popupClose" value="immediate"/>
-              </tc:button>
-              <tc:button label="Redisplay">
-                <f:ajax render="box-1" execute="box-1"/>
-              </tc:button>
-              <tc:button label="Ok">
-                <tc:attribute name="popupClose" value="afterSubmit"/>
-              </tc:button>
-            </tc:panel>
-          </tc:box>
-        </tc:popup>
-      </f:facet>
-    </tc:button>
-    <tc:button label="Open Popup (AJAX)">
-      <f:ajax render="popup-1" execute="popup-1"/>
-      <tc:popupReference for="popup-1"/>
-    </tc:button>
-    <tc:button label="Update"/>
-  </tc:panel>
-</tc:box>
-</tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1091.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1091.selenium.html
deleted file mode 100644
index 20829b3..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1091.selenium.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/" />
-<title>Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/popup/popup-bug-tobago-1091.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:check</td>
-	<td>on</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=page:open</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=page:popup:close</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:check</td>
-	<td>on</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1103.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1103.selenium.html
deleted file mode 100644
index 7a4ffe7..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-bug-tobago-1103.selenium.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/popup/popup-bug-tobago-1103.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:open-0</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:open-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:open-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:popup-2:form:picker</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:form:picker</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:popup-2:form:pickerpopup:cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:form:pickerpopup:cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1:popup-2:form:pickerpopup</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:close-2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1:popup-2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:close-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:open-0</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:open-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:open-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:popup-2:form:picker</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:open-2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=page:popup-1:popup-2:popup-3:close-3</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:popup-3:close-3</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1:popup-2:popup-3</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:popup-2:close-2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1:popup-2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup-1:close-1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup-1</td>
-	<td></td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-close-after-submit-and-ajax.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-close-after-submit-and-ajax.selenium.html
deleted file mode 100644
index d66b099..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-close-after-submit-and-ajax.selenium.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/" />
-<title>Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/popup/popup-close-after-submit-and-ajax.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:readonly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=page:open</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=page:popup:in</td>
-	<td>foo bar</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:popup:close</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementNotPresent</td>
-	<td>id=page:popup:close</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:readonly</td>
-	<td>foo bar</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-draggable.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-draggable.selenium.html
deleted file mode 100644
index 1220d43..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/popup/popup-draggable.selenium.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/popup/popup-draggable.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=page:open</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertElementPositionLeft</td>
-	<td>//div[@id='page:popup:box']/div/div/div</td>
-	<td>350</td>
-</tr>
-<tr>
-	<td>assertElementPositionTop</td>
-	<td>//div[@id='page:popup:box']/div/div/div</td>
-	<td>100</td>
-</tr>
-<tr>
-	<td>dragAndDrop</td>
-	<td>//div[@id='page:popup:box']/div/div/div</td>
-	<td>-150,50</td>
-</tr>
-<tr>
-	<td>assertElementPositionLeft</td>
-	<td>//div[@id='page:popup:box']/div/div/div</td>
-	<td>200</td>
-</tr>
-<tr>
-	<td>assertElementPositionTop</td>
-	<td>//div[@id='page:popup:box']/div/div/div</td>
-	<td>150</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/reload/Tip.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/reload/Tip.xhtml
deleted file mode 100644
index 7bf273b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/reload/Tip.xhtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view xmlns:tc="http://myfaces.apache.org/tobago/component"
-            xmlns:ui="http://java.sun.com/jsf/facelets"
-        xmlns:f="http://java.sun.com/jsf/core">
-  <tc:page>
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <tc:separator label="Reload test for tips."/>
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout margin="10px" rows="20px auto 20px auto;" columns="300px"/>
-      </f:facet>
-      <f:facet name="reload">
-        <tc:reload frequency="5000" update="#{reload.reload}"/>
-      </f:facet>
-
-      <tc:out value="This panel will be reloaded every 5 seconds."/>
-
-      <tc:in value="#{reload.counter}" readonly="true" tip="Test of &quot; (quotation mark)"/>
-
-      <tc:label value="Label" tip="Test of &quot; (quotation mark)"/>
-
-      <tc:selectOneChoice tip="Test of &quot; (quotation mark)">
-        <tc:selectItem itemValue="a" itemLabel="A Value"/>
-        <tc:selectItem itemValue="b" itemLabel="An Alternative"/>
-      </tc:selectOneChoice>
-    </tc:panel>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/Script_Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/Script_Event.xhtml
deleted file mode 100644
index 8411a7c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/Script_Event.xhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout columns="1fr 1fr" rows="auto 1fr"/>
-    </f:facet>
-    <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
-    <tc:messages>
-      <!-- <tc:gridLayoutConstraint columnSpan="2" /> -->
-    </tc:messages>
-
-    <tc:box id="panel">
-      <f:facet name="layout">
-        <tc:gridLayout rows="1fr auto auto auto"/>
-      </f:facet>
-
-      <tc:script
-          file="test/script/script-event.js"
-          onload="ScriptEvent.onload();"
-          onunload="ScriptEvent.onunload();"
-          onexit="ScriptEvent.onexit();">
-      </tc:script>
-
-      <tc:out value="TODO: write an automated tests."/>
-
-      <tc:button label="No Action"/>
-      <tc:button label="Action" action="#{scriptEventController.action}"/>
-      <tc:button label="External link" link="http://www.apache.org" target="_blank"/>
-
-    </tc:box>
-
-    <tc:box id="list" label="time">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto 1fr"/>
-      </f:facet>
-
-      <tc:button label="Reload List">
-        <f:ajax render="list" execute="list"/>
-      </tc:button>
-
-      <tc:sheet value="#{scriptEventController.items}" var="item">
-        <tc:column label="Event">
-          <tc:out value="#{item.name}"/>
-        </tc:column>
-        <tc:column label="Time">
-          <tc:out value="#{item.time}">
-            <f:convertDateTime timeStyle="long" type="time"/>
-          </tc:out>
-        </tc:column>
-      </tc:sheet>
-
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/script-event.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/script-event.js
deleted file mode 100644
index 24f3425..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/script/script-event.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-ScriptEvent = {};
-
-ScriptEvent.onload = function() {
-  jQuery.ajax({url:"/ScriptEventServlet?event=onload",async:false});
-};
-
-ScriptEvent.onunload = function() {
-  jQuery.ajax({url:"/ScriptEventServlet?event=onunload",async:false});
-};
-
-ScriptEvent.onexit = function() {
-  jQuery.ajax({url:"/ScriptEventServlet?event=onexit",async:false});
-};
-
-function showTime() {
-  jQuery(DomUtils.escapeClientId("page:list")).find(".tobago-box-header").html(formatDate(new Date(), "hh:mm:ss"));
-  setTimeout(showTime, 500);
-}
-
-setTimeout(showTime, 0);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Buttons_With_Image.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Buttons_With_Image.xhtml
deleted file mode 100644
index abe34af..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Buttons_With_Image.xhtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-
-    <tc:segmentLayout large="1seg 1seg 1seg 1seg 1seg 1seg 1seg 1seg 1seg 1seg 1seg 1seg" medium="3seg 3seg 3seg 3seg">
-
-      <tc:button image="fa-remove" label="1a Abbrechen" />
-      <tc:button image="fa-refresh" label="1b Aktualisieren" />
-      <tc:button image="fa-paperclip" label="1c Anhang" />
-      <tc:button image="fa-sign-in" label="1d Anmelden" />
-
-      <!-- XXX here is a problem in Firefox 40 and IE 11 when rendering.
-      XXX In Chrome and Safari the page is okay.
-      The image="image/feather-leaf" will create an <img> tag in HTML. This will break the
-      12 column layout:
-      The next line begins after this button, and not in the first column.
-
-      The reason is, that the image is slightly higher than the icon
-      -->
-      <tc:button image="image/feather-leaf" label="2a Ansicht öffnen" />
-      <tc:button image="fa-eye-close" label="2b Ansicht schlieĂźen" />
-      <tc:button image="fa-tasks" label="2c Aufgabe" />
-      <tc:button image="fa-scissors" label="2d Ausschneiden" />
-
-      <tc:button image="fa-pencil" label="3a Bearbeiten" />
-      <tc:button image="fa-sign-out" label="3b Beenden" />
-      <tc:button image="fa-bookmark" label="3c Bookmark" />
-      <tc:button image="fa-asterisk" label="3d Clear" />
-
-      <tc:button image="fa-export" label="4a Dateiexport" />
-      <tc:button image="fa-th-list" label="4b Detail" />
-      <tc:button image="fa-stats" label="4c Diagramm" />
-      <tc:button image="fa-modal-window" label="4d Display" />
-
-      <tc:button image="fa-file" label="5a Dokument" />
-      <tc:button image="fa-envelope" label="5b Email" />
-      <tc:button image="fa-minus" label="5c Entfernen" />
-      <tc:button image="fa-ok" label="5d Fertig" />
-
-      <tc:button image="fa-filter" label="6a Filtern" />
-      <tc:button image="image/feather-leaf" label="6b Gruppe" />
-      <tc:button image="fa-question-circle" label="6c Hilfe" />
-      <tc:button image="fa-plus" label="6d HinzufĂĽgen" />
-
-      <tc:button image="fa-home" label="7a Home" />
-      <tc:button image="fa-calendar" label="7b Kalender" />
-      <tc:button image="fa-copy" label="7c Kopieren" />
-      <tc:button image="fa-trash" label="7d Löschen" />
-
-      <tc:button image="fa-resize-full" label="8a Maximieren" />
-      <tc:button image="fa-resize-small" label="8b Minimieren" />
-      <tc:button image="fa-file" label="8c Neu" />
-      <tc:button image="fa-folder-open" label="8d Ă–ffnen" />
-
-      <tc:button image="fa-undo" label="9a Rückgängig" />
-      <tc:button image="fa-lock" label="9b Sicherheit" />
-      <tc:button image="fa-save" label="9c Sichern" />
-      <tc:button image="fa-search" label="9d Suchen" />
-
-      <tc:button image="fa-clock-o" label="10a Uhrzeit" />
-      <tc:button image="fa-forward" label="10b Weiter" />
-      <tc:button image="fa-repeat" label="10c Erneut" />
-      <tc:button image="fa-backward" label="10d ZurĂĽck" />
-
-      <tc:button image="fa-import" label="11a Dateiimport" />
-      <tc:button image="fa-link" label="11b Link" />
-      <tc:button image="fa-folder-close" label="11c Ordner schlieĂźen" />
-      <tc:button image="fa-folder-open" label="11d Ordner öffnen" />
-
-      <tc:button image="fa-print" label="12a Drucken" />
-      <tc:button image="fa-th" label="12b Berechnen" />
-      <tc:button image="fa-eur" label="12c Umrechnungskurs" />
-      <tc:button image="fa-check" label="12d PrĂĽfen" />
-    </tc:segmentLayout>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_1.xhtml
deleted file mode 100644
index 41fa6e1..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_1.xhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page" label="Layout">
-    <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:label value="1st label"/>
-      <tc:in value="a aa aaa aaaa aaaaa" labelLayout="none"/>
-      <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
-             labelLayout="segmentLeft"/>
-      <tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
-      <tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
-    </tc:segmentLayout>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_2.xhtml
deleted file mode 100644
index fe22a71..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_2.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <!--
-  same as simple-1.xhtml, but here are two panels, which contains the controls.
-  -->
-
-  <tc:page id="page">
-    <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:in label="1st label" value="a aa aaa aaaa aaaaa" labelLayout="segmentLeft"/>
-      <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
-             labelLayout="segmentLeft"/>
-    </tc:segmentLayout>
-    <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
-      <tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
-    </tc:segmentLayout>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_3.xhtml
deleted file mode 100644
index 1df26f5..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/segmentLayout/Simple_3.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-
-    <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:in label="1st label" value="#{bootstrapController.value}" labelLayout="segmentLeft"/>
-      <tc:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb bbb bbbb bbbbb "
-             labelLayout="segmentLeft"/>
-    </tc:segmentLayout>
-
-    <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:textarea label="3rd label" value="c cc ccc cccc ccccc" labelLayout="segmentLeft"/>
-      <tc:textarea label="4th label" value="d dd ddd dddd ddddd" labelLayout="segmentLeft"/>
-    </tc:segmentLayout>
-
-    <tc:segmentLayout medium="1seg 1seg 1seg" extraSmall="4seg 4seg 4seg">
-      <tc:button id="cancel" label="Cancel" action="#{bootstrapController.reset}"/>
-      <tc:button id="save" label="Save" action="#{bootstrapController.save}"/>
-      <tc:button id="delete" label="Delete" action="#{bootstrapController.delete}"/>
-    </tc:segmentLayout>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Header_Footer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Header_Footer.xhtml
deleted file mode 100644
index bf44a67..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Header_Footer.xhtml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px"/> -->
-
-    <tc:box>
-
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto auto" rowSpacing="50px" margin="50px"/>
-      </f:facet>
-
-      <!--
-        haeder: false
-        footer: false
-       -->
-      <tc:sheet value="#{sheetTestController.solarArray3}" id="sheet1" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="false">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!--
-        haeder: true
-        footer: false
-       -->
-      <tc:sheet value="#{sheetTestController.solarArray3}" id="sheet2" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!--
-        haeder: false
-        footer: true
-       -->
-      <tc:sheet value="#{sheetTestController.solarArray3}" id="sheet3" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="false" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!--
-        haeder: true
-        footer: true
-       -->
-      <tc:sheet value="#{sheetTestController.solarArray3}" id="sheet4" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-    </tc:box>
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script>
-      jQuery(function () {
-        jQuery("td>span").css("background-color", "white");
-        jQuery("td:odd").css("background-color", "#ffbbff");
-        jQuery("td:even").css("background-color", "#bbffbb");
-        jQuery(".tobago-sheet-body").css("border-color", "Black");
-      });
-    </tc:script>
-
-    <!--
-    left: 56 = 0 + 6 (box) + 50 (margin)
-    top: 76 = 0 + 26 + 50
-    width: 487 = 600 - 13 (box) - 2*50 margin
-    height: 63 = (3 * (20 (line-height) + 1 (line-distance)) - 1) + 1 (border)
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet1', 56, 76, 487, 63);"/>
-
-    <!--
-    height of sheet1 + 21
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet2', 56, 189, 487, 84);"/>
-
-    <!--
-    height of sheet1 + 16
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet3', 56, 323, 487, 79);"/>
-
-    <!--
-    height of sheet1 + 16 + 21
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet4', 56, 452, 487, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Rows.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Rows.xhtml
deleted file mode 100644
index ae76d0c..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Height_Rows.xhtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px"/> -->
-
-    <tc:box>
-
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto auto auto 100px" rowSpacing="50px" margin="50px"/>
-      </f:facet>
-
-      <!-- fixed rows = 3 - show exactly 3 rows, but have more -->
-      <tc:sheet value="#{sheetTestController.solarArray}" id="sheet1" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!-- rows = undefined (default 0), data model has 3 => show all = 3 -->
-      <tc:sheet value="#{sheetTestController.solarArray3}" id="sheet2" columns="1fr 1fr" var="luminary"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!-- data-model has undefined rowCount, rows=3 -->
-      <tc:sheet value="#{sheetTestController.undefined}" id="sheet3" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-      <!-- data-model has undefined rowCount, rows = undefined -->
-      <tc:sheet value="#{sheetTestController.undefined}" id="sheet4" columns="1fr 1fr" var="luminary"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-    </tc:box>
-    <tc:script file="script/tobago-assert.js"/>
-
-    <!--
-    left: 56 = 0 + 6 (box) + 50 (margin)
-    top: 76 = 0 + 26 + 50
-    width: 487 = 600 - 13 (box) - 2*50 margin
-    height: 100 = (3 * (20 (line-height) + 1 (line-distance)) - 1) + 1 (border) + 16 + 21
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet1', 56, 76, 487, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet2', 56, 226, 487, 100);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet3', 56, 376, 487, 100);"/>
-
-    <!--
-     height: sheet1 + 7 * (20 + 1)
-    -->
-    <tc:script onload="TobagoAssert.assertLayout('page:sheet4', 56, 526, 487, 100);"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Width.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Width.xhtml
deleted file mode 100644
index 41a836f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Auto_Width.xhtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint /> -->
-
-    <tc:box label="NOT IMPLEMENTED (TODO)">
-
-      <f:facet name="layout">
-        <tc:gridLayout columns="auto" rows="auto"/>
-      </f:facet>
-
-      <tc:sheet value="#{sheetTestController.solarArray}" id="sheet1" columns="1fr 1fr" var="luminary" rows="3"
-                showHeader="true" showPagingAlways="true">
-        <tc:column label="Name" id="name" sortable="true">
-          <tc:out value="#{luminary.name}"/>
-        </tc:column>
-        <tc:column label="Orbit Of" id="orbit">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-
-        <!-- fixme: implement it and set the value 500 to the correct value -->
-        <tc:dataAttribute name="assert-width" value="500"/>
-
-      </tc:sheet>
-
-    </tc:box>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Bug_Tobago_1090.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Bug_Tobago_1090.xhtml
deleted file mode 100644
index 3b7fb1f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Bug_Tobago_1090.xhtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page width="800px" height="400px" id="page">
-
-    <tc:box label="TOBAGO-1090">
-      <f:facet name="layout">
-        <tc:gridLayout rows="auto 1fr auto"/>
-      </f:facet>
-      <tc:link
-          label="Bug-Tracking: TOBAGO-1090" link="https://issues.apache.org/jira/browse/TOBAGO-1090"/>
-      <tc:out escape="false" value="Single select in the sheet doesn't respect paging.
-            &lt;br/>Checklist:
-            &lt;ol>
-            &lt;li>Click on the 3rd row (Venus)&lt;/li>
-            &lt;li>Click on button for next page&lt;/li>
-            &lt;li>Click on the 2nd row (Saturn)&lt;/li>
-            &lt;li>Click on button for previous page&lt;/li>
-            &lt;li>Check: 3rd row (Venus) must not be selected&lt;/li>
-            &lt;li>Click on button for next page&lt;/li>
-            &lt;li>Check: 2nd row (Saturn) must be selected&lt;/li>
-            &lt;/ol>"/>
-
-      <tc:sheet value="#{sheetTestController.solarArray}" id="sheet" columns="1fr 1fr" var="luminary" rows="5" selectable="single">
-        <tc:column label="Name" sortable="true">
-          <tc:out value="#{luminary.name}" id="name"/>
-        </tc:column>
-        <tc:column label="Orbit Of">
-          <tc:out value="#{luminary.orbit}"/>
-        </tc:column>
-      </tc:sheet>
-
-    </tc:box>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Large.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Large.xhtml
deleted file mode 100644
index a280bdb..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Large.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="1fr auto"/>
-    </f:facet>
-
-    <tc:sheet value="#{sheetTestController.localeList}" id="sheet" columns="auto 5fr 5fr 5fr 1fr" var="entry" rows="1000">
-      <tc:columnSelector disabled="#{entry.disabled}"/>
-      <tc:column label="Locale" id="l" sortable="true">
-        <tc:out value="#{entry.locale}"/>
-      </tc:column>
-      <tc:column label="Display Locale" id="d" sortable="true">
-        <tc:out value="#{entry.displayLocale}"/>
-      </tc:column>
-      <tc:column label="Country" id="c" sortable="true">
-        <tc:out value="#{entry.country}"/>
-      </tc:column>
-      <tc:column label="Language" id="a" sortable="true">
-        <tc:out value="#{entry.language}"/>
-      </tc:column>
-    </tc:sheet>
-
-    <tc:box label="Performance test">
-      <f:facet name="layout">
-        <tc:gridLayout columns="2fr 1fr"/>
-      </f:facet>
-      <tc:in readonly="true" label="Select 1st row"/>
-      <tc:button label="Run" omit="true">
-        <tc:dataAttribute name="clickrow" value="0"/>
-      </tc:button>
-      <tc:in readonly="true" label="Select 2nd row"/>
-      <tc:button label="Run" omit="true">
-        <tc:dataAttribute name="clickrow" value="1"/>
-      </tc:button>
-    </tc:box>
-
-    <tc:script file="test/sheet/sheet-large.js"/>
-    <tc:script file="script/tobago-assert.js"/>
-    <!--todo-->
-    <!--<tc:script onload="TobagoAssert.assertLayout('page:todo', 0, 0, 600, 14);"/>-->
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Multi_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Multi_Header.xhtml
deleted file mode 100644
index 0592a94..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Multi_Header.xhtml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="802px" height="230px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="auto 1fr auto"/>
-    </f:facet>
-
-    <tc:script>
-
-      initMultiHeader = function() {
-        jQuery("td>span").css("background-color", "white");
-        jQuery("td:odd").css("background-color", "#ffbbff");
-        jQuery("td:even").css("background-color", "#bbffbb");
-
-        jQuery(".tobago-sheet-headerResize").css({
-              "background-color":"red",
-              "opacity":0.3
-            }
-        );
-      };
-
-<!--
-      Tobago5.Listener.register(initMultiHeader, Tobago5.Phase.DOCUMENT_READY);
-      Tobago5.Listener.register(initMultiHeader, Tobago5.Phase.AFTER_UPDATE);
--->
-
-    </tc:script>
-
-    <tc:messages />
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="sheet" columns="1fr 1fr 1fr 1fr" var="luminary" showRoot="true"
-              showRowRange="left" rows="5">
-
-      <f:facet name="header">
-        <tc:panel>
-          <tc:in value="Single 1"/>
-          <tc:out value="Group 2+3">
-            <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-          </tc:out>
-          <tc:out value="Rows 4+4">
-            <!-- <tc:gridLayoutConstraint rowSpan="2"/> -->
-          </tc:out>
-          <tc:out value="Group 1+2">
-            <!-- <tc:gridLayoutConstraint columnSpan="2"/> -->
-          </tc:out>
-          <tc:selectOneChoice value="Single 3">
-            <tc:selectItem itemLabel="first" itemValue="Single 3"/>
-            <tc:selectItem itemLabel="second"/>
-            <tc:selectItem itemLabel="third"/>
-          </tc:selectOneChoice>
-        </tc:panel>
-      </f:facet>
-
-      <tc:column label="Name" id="name">
-        <tc:in value="#{luminary.name}"/>
-      </tc:column>
-
-      <tc:column label="Discoverer" id="discoverer" sortable="true">
-        <tc:out value="#{luminary.discoverer}"/>
-      </tc:column>
-
-      <tc:column label="Discover Year" id="discoverYear" sortable="true">
-        <tc:out value="#{luminary.discoverYear}"/>
-      </tc:column>
-
-      <tc:column label="Orbit Of" id="orbit" sortable="true">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-
-    </tc:sheet>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr auto"/>
-      </f:facet>
-
-      <tc:panel/>
-      <tc:button label="Submit" id="submit"/>
-    </tc:panel>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_1.xhtml
deleted file mode 100644
index e6ea1cb..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_1.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="s3" columns="1fr 1fr" var="luminary" rows="1">
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_11.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_11.xhtml
deleted file mode 100644
index 2155e23..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_11.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="100px"/>
-    </f:facet>
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="s2" columns="1fr 1fr" var="luminary" rows="11">
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_20.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_20.xhtml
deleted file mode 100644
index 2ca48a7..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Paging_20.xhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="s1" columns="1fr 1fr" var="luminary" rows="20">
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Reload.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Reload.xhtml
deleted file mode 100644
index df742ce..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Reload.xhtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="40px auto auto 1fr"/>
-    </f:facet>
-
-    <tc:out value="Starting by 0 every 2 seconds the page will be reloaded. The counter on the server will
-    be incremented every reload, but odd values will send a 304 (not modified) to the client, so that
-    the sheet must not be updated."/>
-    <tc:out value="After 3 seconds there must only a 304 (not modified) reload, so we expect 0 as value."/>
-    <tc:out value="After 5 seconds there must be a normal reload, so we expect 2 as value."/>
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="sheet" columns="1fr 1fr" var="luminary" rows="5">
-
-      <f:facet name="reload">
-        <tc:reload frequency="2000" update="#{reload.onlyEven}" />
-      </f:facet>
-
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Reload" id="reload">
-        <tc:out value="#{reload.counter}"/>
-      </tc:column>
-    </tc:sheet>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <tc:script file="test/sheet/sheet-reload.js"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Selector.xhtml
deleted file mode 100644
index e1c7bba..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Selector.xhtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    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="http://www.w3.org/1999/xhtml">
-
-  <tc:page id="page">
-    <f:facet name="layout">
-      <tc:gridLayout rows="160px auto" columns="600px"/>
-    </f:facet>
-
-    <tc:flowLayout>
-
-      <ul>
-        <li>
-          <tc:out value="Selection in a sheet."/>
-        </li>
-        <li>
-          <tc:out value="Planets aren't selectable."/>
-        </li>
-      </ul>
-
-      <ol>
-        <li>
-          <tc:out value="Select all"/>
-        </li>
-        <li>
-          <tc:out value="Unselect all"/>
-        </li>
-        <li>
-          <tc:out value="Select 1st, 2nd (disabled) and 11th row"/>
-        </li>
-        <li>
-          <tc:out value="Toggle all"/>
-        </li>
-        <li>
-          <tc:out value="Go to the 2nd page"/>
-        </li>
-        <li>
-          <tc:out value="Go back to the 1st page"/>
-        </li>
-      </ol>
-
-    </tc:flowLayout>
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="sheet" columns="auto 1fr 1fr" var="luminary" rows="20">
-
-      <tc:columnSelector disabled="#{luminary.orbit == 'Sun'}"/>
-
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Simple.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Simple.xhtml
deleted file mode 100644
index 170abe7..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Simple.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <tc:sheet value="#{sheetTestController.solarArray}" id="sheet" columns="1fr 1fr" var="luminary" rows="5">
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-    <tc:script file="script/tobago-assert.js"/>
-    <!--todo-->
-    <!--<tc:script onload="TobagoAssert.assertLayout('page:todo', 0, 0, 600, 14);"/>-->
-
-    <tc:script file="test/sheet/sheet-simple.js"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Sort.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Sort.xhtml
deleted file mode 100644
index cf575e4..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Sort.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-
-    <tc:sheet value="#{sheetSortController.list}" id="sheet" columns="1fr 1fr 1fr 1fr 1fr 1fr" var="entry">
-      <tc:column label="tc:out" id="first" sortable="true">
-        <tc:out value="#{entry.first}" id="out"/>
-      </tc:column>
-      <tc:column label="tc:in" id="second" sortable="true">
-        <tc:in value="#{entry.second}" id="in" readonly="true"/>
-      </tc:column>
-      <tc:column label="tc:link" id="third" sortable="true">
-        <tc:link label="#{entry.third}"  id="link"/>
-      </tc:column>
-      <tc:column label="tc:button" id="fourth" sortable="true">
-        <tc:button label="#{entry.fourth}" id="button"/>
-      </tc:column>
-      <tc:column label="tc:date" id="fifth" sortable="true">
-        <tc:date value="#{entry.fifth}" id="date">
-          <f:convertDateTime timeZone="UTC" pattern="dd. MMM yyyy"/>
-        </tc:date>
-      </tc:column>
-      <tc:column label="tc:link -> tc:out" id="sixth" sortable="true">
-        <tc:link id="link2">
-          <tc:out value="#{entry.sixth}" id="out2"/>
-        </tc:link>
-      </tc:column>
-    </tc:sheet>
-
-    <tc:script file="script/tobago-assert.js"/>
-
-    <tc:script onload="TobagoAssert.assertContent('page:sheet:0:out', 'A');"/>
-    <tc:script onload="TobagoAssert.assertContent('page:sheet:1:out', 'B');"/>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Tree.xhtml
deleted file mode 100644
index 0e40762..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Tree.xhtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="900px" height="500px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="1fr auto"/>
-    </f:facet>
-
-    <tc:sheet value="#{treeTestController.tree}" id="sheet" columns="1fr 1fr" var="row" showRoot="true" showRootJunction="true">
-
-      <tc:columnNode label="Tree" id="tree">
-        <tc:treeIndent/>
-        <tc:treeLabel value="#{row.userObject.name}"/>
-      </tc:columnNode>
-
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{row.userObject.name}"/>
-      </tc:column>
-
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="Tip: #{row.userObject.tip}"/>
-      </tc:column>
-
-    </tc:sheet>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="1fr auto"/>
-      </f:facet>
-
-      <tc:panel/>
-      <tc:button label="Submit" id="submit"/>
-    </tc:panel>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Unknown_Row_Count.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Unknown_Row_Count.xhtml
deleted file mode 100644
index c7d9a0f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Unknown_Row_Count.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-    <f:facet name="layout">
-      <tc:gridLayout rows="600px"/>
-    </f:facet>
-
-    <tc:sheet value="#{sheetTestController.undefined}" id="sheet" columns="1fr 1fr" var="luminary" rows="20">
-      <tc:column label="Name" id="name" sortable="true">
-        <tc:out value="#{luminary.name}"/>
-      </tc:column>
-      <tc:column label="Orbit Of" id="orbit">
-        <tc:out value="#{luminary.orbit}"/>
-      </tc:column>
-    </tc:sheet>
-
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Without_Columns_Definition.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Without_Columns_Definition.xhtml
deleted file mode 100644
index 4d0e721..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/Sheet_Without_Columns_Definition.xhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
-    xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core">
-
-  <tc:page>
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
-
-    <tc:sheet var="luminary">
-      <tc:column label="Name">
-      </tc:column>
-      <tc:column label="Orbit Of">
-      </tc:column>
-    </tc:sheet>
-  </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-bug-tobago-1090.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-bug-tobago-1090.selenium.html
deleted file mode 100644
index b02a2b2..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-bug-tobago-1090.selenium.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/sheet/sheet-bug-tobago-1090.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:sheet:2:name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>page:sheet::selected</td>
-	<td>,2,</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:sheet::pagingPages::pagingArrows::Next</td><!-- XXX link id was changed in Tobago 3.0 -->
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>page:sheet::selected</td>
-	<td>,2,</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:sheet:6:name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>page:sheet::selected</td>
-	<td>,6,</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:sheet::pagingPages::pagingArrows::Prev</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>page:sheet::selected</td>
-	<td>,6,</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=page:sheet::pagingPages::pagingArrows::Next</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>page:sheet::selected</td>
-	<td>,6,</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-large.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-large.js
deleted file mode 100644
index 3a4937d..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-large.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-TestSheet = {};
-
-TestSheet.init = function() {
-
-  jQuery("[data-clickrow]").click(function() {
-    var rowIndex = jQuery(this).data("clickrow");
-    var row = jQuery(".tobago-sheet-body tr").eq(rowIndex);
-    var status = jQuery(this).prev().find("input");
-    status.val("processing ...");
-    var start = new Date();
-    row.click();
-    var end = new Date();
-    status.val(end.getTime() - start.getTime() + " ms");
-  });
-};
-
-Listener.register(TestSheet.init, Phase.DOCUMENT_READY);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-1.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-1.selenium.html
deleted file mode 100644
index 2568230..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-1.selenium.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/sheet/sheet-paging-1.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=.tobago-sheet-footer</td>
-	<td>Zeile 1 von 88123456789...Seite 1 von 88</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-11.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-11.selenium.html
deleted file mode 100644
index 18eb158..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-11.selenium.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/sheet/sheet-paging-11.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=.tobago-sheet-footer</td>
-	<td>Zeilen 1 bis 11 von 8812345678Seite 1 von 8</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-20.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-20.selenium.html
deleted file mode 100644
index f594701..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-paging-20.selenium.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/test/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/sheet/sheet-paging-20.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=.tobago-sheet-footer</td>
-	<td>Zeilen 1 bis 20 von 8812345Seite 1 von 5</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-reload.js b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-reload.js
deleted file mode 100644
index 0cbb8f8..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-reload.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-TestSheetReload = {};
-
-TestSheetReload.init = function() {
-
-  setTimeout(function() {
-    var value = jQuery(".tobago-sheet-body td").eq(1).find("span").html();
-    if (value !== "0") {
-      console.error("expect '0' not '" + value + "'");
-    }
-  }, 3000);
-
-  setTimeout(function() {
-    var value = jQuery(".tobago-sheet-body td").eq(1).find("span").html();
-    if (value !== "2") {
-      console.error("expect '2' not '" + value + "'");
-    }
-  }, 5000);
-
-};
-
-Listener.register(TestSheetReload.init, Phase.DOCUMENT_READY);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-selector.selenium.html b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-selector.selenium.html
deleted file mode 100644
index 1bf09d7..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/sheet/sheet-selector.selenium.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/faces/tc/button/link-attribute.xhtml" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/faces/test/sheet/sheet-selector.xhtml</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>css=img</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link=Alles markieren</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_0</td>
-	<td>on</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_1</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_9</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_10</td>
-	<td>on</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_19</td>
-	<td>on</td>
-</tr>
-<tr>
-	<td>assertAttribute</td>
-	<td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[1]@class</td>
-	<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
-</tr>
-<tr>
-	<td>assertAttribute</td>
-	<td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[2]@class</td>
-	<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
-</tr>
-<tr>
-	<td>assertAttribute</td>
-	<td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[10]@class</td>
-	<td>tobago-sheet-row tobago-sheet-row-markup-even</td>
-</tr>
-<tr>
-	<td>assertAttribute</td>
-	<td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[11]@class</td>
-	<td>tobago-sheet-row tobago-sheet-row-markup-odd tobago-sheet-row-markup-selected</td>
-</tr>
-<tr>
-	<td>assertAttribute</td>
-	<td>//table[@class='tobago-sheet-bodyTable']/tbody/tr[20]@class</td>
-	<td>tobago-sheet-row tobago-sheet-row-markup-even tobago-sheet-row-markup-selected</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>css=img</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link=Markierungen löschen</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_0</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_1</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_9</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>id=page:sheet_data_row_selector_10</td>
... 1979 lines suppressed ...