myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] branch master updated: demo: clean up and naming conventions
Date Thu, 17 May 2018 13:19:00 GMT
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 b395e67  demo: clean up and naming conventions
b395e67 is described below

commit b395e67ef37fc1baf1827f503b39ad207d7b65ff
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Thu May 17 14:16:04 2018 +0200

    demo: clean up and naming conventions
---
 .../{Attribute.java => AttributeController.java}   |   2 +-
 .../tobago/example/{test => demo}/KillSession.java |  13 +-
 .../tobago/example/demo/SheetController.java       |   4 +-
 ...DynamicPanel.java => AbstractDynamicPanel.java} |  15 +-
 .../{Bootstrap.java => BootstrapController.java}   |  10 +-
 .../tobago/example/test/DateController.java        |  51 ------
 .../{DynamicBean.java => DynamicController.java}   |  16 +-
 ...PopupData.java => DynamicPanel1Controller.java} |   7 +-
 ...micPanel2.java => DynamicPanel2Controller.java} |   7 +-
 ...micPanel3.java => DynamicPanel3Controller.java} |   6 +-
 .../test/{ErrorTest.java => ErrorController.java}  |   7 +-
 .../test/{Hidden.java => HiddenController.java}    |  10 +-
 .../myfaces/tobago/example/test/Immediate.java     |  80 ---------
 .../apache/myfaces/tobago/example/test/InBean.java |  45 -----
 .../example/test/InputSuggestController.java       |  47 ------
 .../myfaces/tobago/example/test/MeasureBean.java   |   5 +
 .../{Messages.java => MessagesTestController.java} |   6 +-
 .../myfaces/tobago/example/test/Partially.java     |  72 --------
 ...DynamicPanel1.java => PopupDataController.java} |   7 +-
 .../tobago/example/test/PopupModalAttribute.java   |  31 ----
 .../apache/myfaces/tobago/example/test/Reload.java |   4 +
 ...sourceBean.java => ResourceBeanController.java} |   8 +-
 ...ScriptEvent.java => ScriptEventController.java} |   6 +-
 .../tobago/example/test/ScriptEventServlet.java    |   2 +-
 .../example/test/SelectBooleanCheckboxBean.java    |  80 ---------
 .../tobago/example/test/SelectManyListboxBean.java | 120 -------------
 .../tobago/example/test/SheetSortController.java   |   4 +
 .../myfaces/tobago/example/test/Shuttle.java       |  47 ------
 .../myfaces/tobago/example/test/Tobago1041.java    |  64 -------
 ...TreeController.java => TreeTestController.java} |   8 +-
 ...seList.java => TrueAndFalseListController.java} |   8 +-
 .../apache/myfaces/tobago/example/test/Upload.java |  60 -------
 .../tobago/example/test/ZIndexController.java      |   4 +
 .../src/main/webapp/WEB-INF/faces-config.xml       | 186 +--------------------
 .../src/main/webapp/WEB-INF/web.xml                |   2 +
 .../content/40-test/9000-attribute/attribute.xhtml |  28 ++--
 .../90000-attic/error/throw-exception.xhtml        |   2 +-
 .../90000-attic/forEach/dynamic-include.xhtml      |   6 +-
 .../{panel-one-fragment.xhtml => x-panel-1.xhtml}  |   2 +-
 .../{panel-two-fragment.xhtml => x-panel-2.xhtml}  |   4 +-
 ...{panel-three-fragment.xhtml => x-panel-3.xhtml} |   4 +-
 .../40-test/90000-attic/hidden/hidden.xhtml        |  12 +-
 .../messages/messages-confirmation.xhtml           |   2 +-
 .../popup/popup-close-after-submit-and-ajax.xhtml  |   4 +-
 .../40-test/90000-attic/popup/z-index.xhtml        |   8 +-
 .../90000-attic/resource/resource-manager.xhtml    |   6 +-
 .../40-test/90000-attic/script/script-event.xhtml  |   4 +-
 .../90000-attic/segmentLayout/simple-3.xhtml       |   8 +-
 .../40-test/90000-attic/sheet/sheet-sort.xhtml     |   3 +-
 .../40-test/90000-attic/sheet/sheet-tree.xhtml     |   2 +-
 .../40-test/90000-attic/tree/tree-command.xhtml    |   2 +-
 .../40-test/90000-attic/tree/tree-expanded.xhtml   |   4 +-
 .../40-test/90000-attic/tree/tree-infinite.xhtml   |   2 +-
 .../90000-attic/tree/tree-marked-with-model.xhtml  |   6 +-
 .../tree/tree-marked-without-model.xhtml           |   2 +-
 .../90000-attic/tree/tree-select-via-state.xhtml   |   2 +-
 .../90000-attic/tree/tree-select-via-value.xhtml   |   2 +-
 .../90000-attic/tree/tree-show-attributes.xhtml    |  10 +-
 .../40-test/90000-attic/tree/tree-simple.xhtml     |   4 +-
 .../90000-attic/treeListbox/treeListbox.xhtml      |   2 +-
 .../9010-mode-valueIfSet/mode-valueIfSet.xhtml     |   2 +-
 61 files changed, 192 insertions(+), 985 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Attribute.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
similarity index 96%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Attribute.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
index f6ae0bc..e4f93f3 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Attribute.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 
 @Named
 @SessionScoped
-public class Attribute implements Serializable {
+public class AttributeController implements Serializable {
 
   private int counter;
   private boolean condition;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/KillSession.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
similarity index 77%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/KillSession.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
index c94430a..15a056f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/KillSession.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
@@ -17,15 +17,20 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.test;
+package org.apache.myfaces.tobago.example.demo;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
+/**
+ * Simple Servlet to kill the user session.
+ */
+@WebServlet(urlPatterns = "/KillSession")
 public class KillSession extends HttpServlet {
 
   @Override
@@ -33,8 +38,10 @@ public class KillSession extends HttpServlet {
       throws ServletException, IOException {
     final HttpSession session = request.getSession(false);
     if (session != null) {
-       session.invalidate();
+      session.invalidate();
+      response.getOutputStream().write("The user session was killed!".getBytes());
+    } else {
+      response.getOutputStream().write("There is no user session to kill!".getBytes());
     }
-    response.getOutputStream().write("session killed".getBytes());
   }
 }
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
index 0eb27e1..5bff77c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
@@ -19,6 +19,7 @@
 
 package org.apache.myfaces.tobago.example.demo;
 
+import org.apache.deltaspike.core.api.scope.ViewAccessScoped;
 import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.model.SelectItem;
 import org.apache.myfaces.tobago.model.Selectable;
@@ -28,7 +29,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIData;
 import javax.faces.context.FacesContext;
@@ -44,7 +44,7 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@SessionScoped
+@ViewAccessScoped
 @Named
 public class SheetController implements Serializable {
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java
similarity index 75%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java
index 8d4294c..4d04a35 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/AbstractDynamicPanel.java
@@ -19,18 +19,21 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public abstract class DynamicPanel {
+import java.io.Serializable;
+
+public abstract class AbstractDynamicPanel implements Serializable {
 
   private static final String[] PANEL_FILES = new String[]{
-      "panel-one-fragment.xhtml",
-      "panel-two-fragment.xhtml",
-      "panel-three-fragment.xhtml"};
+      "x-panel-1.xhtml",
+      "x-panel-2.xhtml",
+      "x-panel-3.xhtml"};
 
   private final String name;
 
-  public DynamicPanel() {
+  public AbstractDynamicPanel() {
     final String simpleName = this.getClass().getSimpleName();
-    final int number = Integer.parseInt(simpleName.substring(simpleName.length() - 1)) - 1;
+    final int pos = simpleName.length() - 1 - "Controller".length();
+    final int number = Integer.parseInt(simpleName.substring(pos, pos + 1)) - 1;
     this.name = PANEL_FILES[number];
   }
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java
similarity index 85%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java
index 71e441f..0d176d5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/BootstrapController.java
@@ -19,11 +19,17 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public class Bootstrap {
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+
+@SessionScoped
+@Named
+public class BootstrapController implements Serializable {
 
   private String value;
 
-  public Bootstrap() {
+  public BootstrapController() {
     reset();
   }
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java
deleted file mode 100644
index 9e26218..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DateController.java
+++ /dev/null
@@ -1,51 +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.io.Serializable;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class DateController implements Serializable {
-
-  private static final Logger LOG = LoggerFactory.getLogger(DateController.class);
-
-  private Date once;
-
-  public DateController() {
-    try {
-      once = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").parse("1980-03-07 21:05:09 012");
-    } catch (final ParseException e) {
-      LOG.error("should not happen. ", e);
-    }
-  }
-
-  public Date getOnce() {
-    return once;
-  }
-
-  public void setOnce(final Date once) {
-    this.once = once;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java
similarity index 78%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicBean.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java
index 5790501..d2e0d22 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicBean.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicController.java
@@ -19,27 +19,31 @@
 
 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;
 
-public class DynamicBean implements Serializable {
+@SessionScoped
+@Named
+public class DynamicController implements Serializable {
 
-  private List<DynamicPanel> panels = new ArrayList<>();
+  private List<AbstractDynamicPanel> panels = new ArrayList<>();
 
   public String addPanel() {
 
     switch (panels.size()) {
       case 0:
-        panels.add(new DynamicPanel1());
+        panels.add(new DynamicPanel1Controller());
         break;
       case 1:
-        panels.add(new DynamicPanel2());
+        panels.add(new DynamicPanel2Controller());
         break;
       case 2:
-        panels.add(new DynamicPanel3());
+        panels.add(new DynamicPanel3Controller());
         break;
       default:
         FacesContext.getCurrentInstance().addMessage(null,
@@ -55,7 +59,7 @@ public class DynamicBean implements Serializable {
 //    return null;
   }
 
-  public List<DynamicPanel> getPanels() {
+  public List<AbstractDynamicPanel> getPanels() {
     return panels;
   }
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java
similarity index 85%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java
index 5e3219d..4116299 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1Controller.java
@@ -19,7 +19,12 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public class PopupData {
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+
+@SessionScoped
+@Named
+public class DynamicPanel1Controller extends AbstractDynamicPanel {
 
   private String value;
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java
similarity index 88%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java
index f3a1779..4834f08 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel2Controller.java
@@ -19,7 +19,12 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public class DynamicPanel2 extends DynamicPanel {
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+
+@SessionScoped
+@Named
+public class DynamicPanel2Controller extends AbstractDynamicPanel {
 
   private String firstName;
   private String secondName;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java
similarity index 86%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java
index 25d1432..142c590 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel3Controller.java
@@ -19,9 +19,13 @@
 
 package org.apache.myfaces.tobago.example.test;
 
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
 import java.io.Serializable;
 
-public class DynamicPanel3 extends DynamicPanel implements Serializable {
+@SessionScoped
+@Named
+public class DynamicPanel3Controller extends AbstractDynamicPanel implements Serializable {
 
   private String street;
   private String city;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorTest.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java
similarity index 90%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorTest.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java
index a2554dd..9c16375 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorTest.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ErrorController.java
@@ -21,7 +21,12 @@ package org.apache.myfaces.tobago.example.test;
 
 import org.apache.myfaces.tobago.example.demo.DemoException;
 
-public class ErrorTest {
+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/Hidden.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java
similarity index 89%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java
index cac680a..7e98a9c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/HiddenController.java
@@ -19,17 +19,17 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
-public class Hidden {
+@RequestScoped
+@Named
+public class HiddenController {
 
   private String value1 = "value 1";
   private String value2 = "value 2";
   private String value3 = "value 3";
 
-  private static final Logger LOG = LoggerFactory.getLogger(Hidden.class);
-
   public String getValue1() {
     return value1;
   }
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java
deleted file mode 100644
index e3e4b7e..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java
+++ /dev/null
@@ -1,80 +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.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import java.io.Serializable;
-
-public class Immediate implements Serializable {
-
-  private String in;
-  private int selectOne;
-  private Integer[] selectMany;
-
-  private SelectItem[] selectItems = new SelectItem[]{
-      new SelectItem(0, "Zero"),
-      new SelectItem(1, "One"),
-      new SelectItem(2, "Two"),
-      new SelectItem(3, "Tree"),
-      new SelectItem(4, "Four"),
-  };
-
-  private static final Logger LOG = LoggerFactory.getLogger(Immediate.class);
-
-  public String test() {
-    final FacesContext facesContext = FacesContext.getCurrentInstance();
-//    LOG.warn("user: " + facesContext.getExternalContext().getRemoteUser().hashCode());
-    LOG.warn("requ: " + facesContext.getExternalContext().getRequest().hashCode());
-    LOG.warn("sess: " + facesContext.getExternalContext().getSessionMap().hashCode());
-    return null;
-  }
-
-  public String getIn() {
-    return in;
-  }
-
-  public void setIn(final String in) {
-    this.in = in;
-  }
-
-  public int getSelectOne() {
-    return selectOne;
-  }
-
-  public void setSelectOne(final int selectOne) {
-    this.selectOne = selectOne;
-  }
-
-  public SelectItem[] getSelectItems() {
-    return selectItems;
-  }
-
-  public void setSelectMany(final Integer[] selectMany) {
-    this.selectMany = selectMany;
-  }
-
-  public Integer[] getSelectMany() {
-    return selectMany;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InBean.java
deleted file mode 100644
index e5e1f9a..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InBean.java
+++ /dev/null
@@ -1,45 +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 class InBean implements Serializable {
-
-  private String first;
-
-  private String second;
-
-  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;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java
deleted file mode 100644
index c99e56a..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.component.UIInput;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class InputSuggestController implements Serializable {
-
-  private static final Logger LOG = LoggerFactory.getLogger(InputSuggestController.class);
-
-  public List<String> inputSuggestItems(final UIInput component) {
-    final String prefix = (String) component.getSubmittedValue();
-    LOG.info("Creating items for prefix :\"" + prefix + "\"");
-    final List<String> li = new ArrayList<>();
-    li.add(prefix + 1);
-    li.add(prefix + 2);
-    li.add(prefix + 3);
-    li.add(prefix + 4);
-    li.add(prefix + 5);
-    li.add(prefix + 6);
-    return li;
-  }
-}
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
index bb1dded..9d9d5c2 100644
--- 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
@@ -21,6 +21,11 @@ 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() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java
similarity index 91%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java
index 4cb1dee..7058acc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/MessagesTestController.java
@@ -19,11 +19,15 @@
 
 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;
 
-public class Messages implements Serializable {
+@SessionScoped
+@Named
+public class MessagesTestController implements Serializable {
 
   public String createMessages() {
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Partially.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Partially.java
deleted file mode 100644
index 80fdd85..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Partially.java
+++ /dev/null
@@ -1,72 +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 class Partially implements Serializable {
-
-  private int counter;
-
-  private String characters;
-
-  public Partially() {
-    final StringBuilder builder = new StringBuilder();
-    builder.append("test_characters = [ ");
-    for (char c = 0; c < 0x24F; c++) {
-
-      builder.append('\'');
-      if (c == '\'' || c == '\\' || c == '\n' || c == '\r') { // to have a valid JavaScript string.
-        builder.append('\\');
-      }
-      builder.append(c);
-      builder.append("\', ");
-      if (c % 16 == 15) {
-        builder.append("\n");
-      }
-    }
-    builder.append("];");
-    characters = builder.toString();
-  }
-
-  public void resetCounter() {
-    counter = 0;
-  }
-
-  public void reload() {
-    counter++;
-  }
-
-  public int getCounter() {
-    return counter;
-  }
-
-  public void setCounter(final int counter) {
-    this.counter = counter;
-  }
-
-  public String getCharacters() {
-    return characters;
-  }
-
-  public void setCharacters(final String characters) {
-    this.characters = characters;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java
similarity index 88%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java
index a250169..263e139 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/DynamicPanel1.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupDataController.java
@@ -19,7 +19,12 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public class DynamicPanel1 extends DynamicPanel {
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@RequestScoped
+@Named
+public class PopupDataController {
 
   private String value;
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java
deleted file mode 100644
index 06f79fb..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java
+++ /dev/null
@@ -1,31 +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 class PopupModalAttribute {
-
-  public boolean isAlwaysTrue() {
-    return true;
-  }
-
-  public boolean isAlwaysFalse() {
-    return false;
-  }
-}
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
index 4361866..2485dce 100644
--- 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
@@ -19,8 +19,12 @@
 
 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;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBeanController.java
similarity index 93%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBeanController.java
index a657dda..ff5253f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBeanController.java
@@ -19,16 +19,20 @@
 
 package org.apache.myfaces.tobago.example.test;
 
+import javax.enterprise.context.RequestScoped;
 import javax.faces.context.FacesContext;
+import javax.inject.Named;
 import java.util.Arrays;
 import java.util.List;
 
-public class ResourceBean {
+@RequestScoped
+@Named
+public class ResourceBeanController {
 
   private List<ResourceEntry> resources;
   private int fails;
 
-  public ResourceBean() {
+  public ResourceBeanController() {
     if (resources == null) {
       final FacesContext facesContext = FacesContext.getCurrentInstance();
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEvent.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java
similarity index 89%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEvent.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java
index 0fd08ef..1414536 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEvent.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/ScriptEventController.java
@@ -19,11 +19,15 @@
 
 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;
 
-public class ScriptEvent implements Serializable {
+@SessionScoped
+@Named
+public class ScriptEventController implements Serializable {
 
   private List<ScriptEventItem> items = new ArrayList<>();
 
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
index 3c9b6bd..b575385 100644
--- 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
@@ -38,7 +38,7 @@ public class ScriptEventServlet extends HttpServlet {
       throws ServletException, IOException {
     final HttpSession session = request.getSession(false);
     if (session != null) {
-      final ScriptEvent scriptEvent = (ScriptEvent) session.getAttribute("scriptEvent");
+      final ScriptEventController scriptEvent = (ScriptEventController) session.getAttribute("scriptEvent");
       if (scriptEvent != null) {
         final String event = request.getParameter("event");
         if (event.equals("onload")) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectBooleanCheckboxBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectBooleanCheckboxBean.java
deleted file mode 100644
index 13cdcb6..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectBooleanCheckboxBean.java
+++ /dev/null
@@ -1,80 +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 class SelectBooleanCheckboxBean implements Serializable {
-
-  private boolean value0 = true;
-  private boolean value1 = true;
-  private boolean value2 = true;
-  private boolean required0 = true;
-  private boolean required1 = true;
-  private boolean required2 = true;
-
-  public boolean isValue0() {
-    return value0;
-  }
-
-  public void setValue0(final boolean value00) {
-    this.value0 = value00;
-  }
-
-  public boolean isValue1() {
-    return value1;
-  }
-
-  public void setValue1(final boolean value01) {
-    this.value1 = value01;
-  }
-
-  public boolean isValue2() {
-    return value2;
-  }
-
-  public void setValue2(final boolean value02) {
-    this.value2 = value02;
-  }
-
-  public boolean isRequired0() {
-    return required0;
-  }
-
-  public void setRequired0(final boolean required0) {
-    this.required0 = required0;
-  }
-
-  public boolean isRequired1() {
-    return required1;
-  }
-
-  public void setRequired1(final boolean required1) {
-    this.required1 = required1;
-  }
-
-  public boolean isRequired2() {
-    return required2;
-  }
-
-  public void setRequired2(final boolean required2) {
-    this.required2 = required2;
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectManyListboxBean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectManyListboxBean.java
deleted file mode 100644
index c68a078..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/SelectManyListboxBean.java
+++ /dev/null
@@ -1,120 +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;
-import java.util.Collection;
-import java.util.Currency;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-public class SelectManyListboxBean implements Serializable {
-
-  private List<String> stringList;
-  private String[] stringArray;
-  private Set<String> stringSet = new HashSet<>();
-  private Collection<String> stringCollection = new LinkedList<>();
-
-  private List<Currency> currencyList;
-  private Currency[] currencyArray;
-  private Set<Currency> currencySet = new HashSet<>();
-  private Collection<Currency> currencyCollection = new LinkedList<>();
-
-  private Currency[] currencyItems;
-
-  public SelectManyListboxBean() {
-    currencyItems = new Currency[]{
-        Currency.getInstance("JPY"),
-        Currency.getInstance("TTD"),
-        Currency.getInstance("USD"),
-        Currency.getInstance("EUR")
-    };
-  }
-
-  public List<String> getStringList() {
-    return stringList;
-  }
-
-  public void setStringList(final List<String> stringList) {
-    this.stringList = stringList;
-  }
-
-  public String[] getStringArray() {
-    return stringArray;
-  }
-
-  public void setStringArray(final String[] stringArray) {
-    this.stringArray = stringArray;
-  }
-
-  public Set<String> getStringSet() {
-    return stringSet;
-  }
-
-  public void setStringSet(final Set<String> stringSet) {
-    this.stringSet = stringSet;
-  }
-
-  public Collection<String> getStringCollection() {
-    return stringCollection;
-  }
-
-  public void setStringCollection(final Collection<String> stringCollection) {
-    this.stringCollection = stringCollection;
-  }
-
-  public List<Currency> getCurrencyList() {
-    return currencyList;
-  }
-
-  public void setCurrencyList(final List<Currency> currencyList) {
-    this.currencyList = currencyList;
-  }
-
-  public Currency[] getCurrencyArray() {
-    return currencyArray;
-  }
-
-  public void setCurrencyArray(final Currency[] currencyArray) {
-    this.currencyArray = currencyArray;
-  }
-
-  public Set<Currency> getCurrencySet() {
-    return currencySet;
-  }
-
-  public void setCurrencySet(final Set<Currency> currencySet) {
-    this.currencySet = currencySet;
-  }
-
-  public Collection<Currency> getCurrencyCollection() {
-    return currencyCollection;
-  }
-
-  public void setCurrencyCollection(final Collection<Currency> currencyCollection) {
-    this.currencyCollection = currencyCollection;
-  }
-
-  public Currency[] getCurrencyItems() {
-    return currencyItems;
-  }
-}
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
index 096e8ce..dc500b6 100644
--- 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
@@ -22,6 +22,8 @@ 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.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -31,6 +33,8 @@ 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(SheetSortController.class);
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Shuttle.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Shuttle.java
deleted file mode 100644
index eb37eec..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Shuttle.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 org.apache.myfaces.tobago.internal.util.StringUtils;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Shuttle implements Serializable {
-
-  private List<String> value;
-
-  public Shuttle() {
-    this.value = new ArrayList<>();
-  }
-
-  public List<String> getValue() {
-    return value;
-  }
-
-  public void setValue(final List<String> value) {
-    this.value = value;
-  }
-
-  public String getResult() {
-    return StringUtils.joinWithSurroundingSeparator(value).substring(1, Math.max(value.size() * 2, 1));
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Tobago1041.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Tobago1041.java
deleted file mode 100644
index 2dd02b5..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Tobago1041.java
+++ /dev/null
@@ -1,64 +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.commons.lang3.StringUtils;
-import org.apache.myfaces.tobago.internal.component.AbstractUISelectBooleanCheckbox;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
-public class Tobago1041 {
-
-  public String getHackFacesMessages() {
-
-    final FacesContext facesContext = FacesContext.getCurrentInstance();
-
-    createMessage(facesContext, "page:literal-tc-both");
-    createMessage(facesContext, "page:literal-tc-item");
-    createMessage(facesContext, "page:literal-tc-label");
-    createMessage(facesContext, "page:literal-tc-no");
-
-    createMessage(facesContext, "page:literal-tx-both");
-    createMessage(facesContext, "page:literal-tx-item");
-    createMessage(facesContext, "page:literal-tx-label");
-    createMessage(facesContext, "page:literal-tx-no");
-
-    createMessage(facesContext, "page:expression-tc-both");
-    createMessage(facesContext, "page:expression-tc-item");
-    createMessage(facesContext, "page:expression-tc-label");
-    createMessage(facesContext, "page:expression-tc-no");
-
-    createMessage(facesContext, "page:expression-tx-both");
-    createMessage(facesContext, "page:expression-tx-item");
-    createMessage(facesContext, "page:expression-tx-label");
-    createMessage(facesContext, "page:expression-tx-no");
-
-    return "hack";
-  }
-
-  private void createMessage(final FacesContext facesContext, final String id) {
-    String label = ((AbstractUISelectBooleanCheckbox) facesContext.getViewRoot().findComponent(id)).getLabel();
-    if (StringUtils.isBlank(label)) {
-      label = "-";
-    }
-    facesContext.addMessage(id, new FacesMessage(FacesMessage.SEVERITY_ERROR, label, label));
-  }
-}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java
similarity index 92%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeController.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java
index b5bc9bd..c9130f7 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TreeTestController.java
@@ -28,10 +28,14 @@ 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;
 
-public class TreeController implements Serializable {
+@SessionScoped
+@Named
+public class TreeTestController implements Serializable {
 
   private DefaultMutableTreeNode tree = CategoryTree.createSample();
 
@@ -43,7 +47,7 @@ public class TreeController implements Serializable {
 
   private CantorInterval infinite = new CantorInterval();
 
-  public TreeController() {
+  public TreeTestController() {
     state.getExpandedState().expand(tree);
   }
 
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseList.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java
similarity index 83%
rename from tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseList.java
rename to tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java
index e36c1c1..61ab6bd 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseList.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/TrueAndFalseListController.java
@@ -19,11 +19,15 @@
 
 package org.apache.myfaces.tobago.example.test;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 
-public class TrueAndFalseList extends ArrayList<Boolean> {
+@Singleton
+@Named
+public class TrueAndFalseListController extends ArrayList<Boolean> {
 
-  public TrueAndFalseList() {
+  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/Upload.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java
deleted file mode 100644
index 443c113..0000000
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java
+++ /dev/null
@@ -1,60 +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.internal.util.PartUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.Part;
-import java.io.Serializable;
-
-public class Upload implements Serializable {
-
-  private static final Logger LOG = LoggerFactory.getLogger(Upload.class);
-
-  private Part part;
-
-  public String upload() {
-    if (part == null) {
-      FacesContext.getCurrentInstance().addMessage(
-          null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "No UploadItem found!", null));
-      return null;
-    }
-    LOG.info("type=" + part.getContentType());
-    LOG.info("size=" + part.getSize());
-    final String name = PartUtils.getSubmittedFileName(part);
-    LOG.info("name=" + name);
-    FacesContext.getCurrentInstance().addMessage(
-        null, new FacesMessage(FacesMessage.SEVERITY_INFO, "File was uploaded: " + name, null));
-
-    return "/test/file/file.xhtml";
-  }
-
-  public Part getFile() {
-    return part;
-  }
-
-  public void setFile(final Part file) {
-    this.part = file;
-  }
-}
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
index d496d0f..01f7cad 100644
--- 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
@@ -19,8 +19,12 @@
 
 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;
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
index 884f59a..740c822 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
@@ -46,193 +46,15 @@
     </resource-bundle>
   </application>
 
-  <converter>
-    <converter-id>salutationId</converter-id>
-    <converter-class>org.apache.myfaces.tobago.example.demo.SalutationConverter</converter-class>
-  </converter>
-
   <lifecycle>
     <phase-listener>org.apache.myfaces.tobago.example.demo.SynchronizeNavigationPhaseListener</phase-listener>
     <!--<phase-listener>org.apache.myfaces.tobago.util.DebugPhaseListener</phase-listener>-->
   </lifecycle>
 
-  <!-- old test classes BEGIN -->
-
-  <managed-bean>
-    <managed-bean-name>browser</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DirectoryBrowser</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>in</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.InBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>inputSuggest</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.InputSuggestController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>immediate</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Immediate</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>hidden</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Hidden</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>upload</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Upload</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>measureBean</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.MeasureBean</managed-bean-class>
-    <managed-bean-scope>none</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>selectBooleanCheckboxBean</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.SelectBooleanCheckboxBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>selectManyListboxBean</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.SelectManyListboxBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>reload</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Reload</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>sort</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.SheetSortController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>tree</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.TreeController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>zIndex</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.ZIndexController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>trueAndFalseList</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.TrueAndFalseList</managed-bean-class>
-    <managed-bean-scope>none</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>partially</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Partially</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>popupModalAttribute</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.PopupModalAttribute</managed-bean-class>
-    <managed-bean-scope>none</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>popupData</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.PopupData</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>tobago1041</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Tobago1041</managed-bean-class>
-    <managed-bean-scope>none</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>shuttle</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Shuttle</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>scriptEvent</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.ScriptEvent</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>resourceBean</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.ResourceBean</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>errorTest</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.ErrorTest</managed-bean-class>
-    <managed-bean-scope>none</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>dynamic</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DynamicBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>panel1</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DynamicPanel1</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>panel2</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DynamicPanel2</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>panel3</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DynamicPanel3</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>bootstrap</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Bootstrap</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>messages</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.Messages</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
-    <managed-bean-name>dateController</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.test.DateController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <!-- old test classes END -->
+  <converter>
+    <converter-id>salutationId</converter-id>
+    <converter-class>org.apache.myfaces.tobago.example.demo.SalutationConverter</converter-class>
+  </converter>
 
   <converter>
     <converter-id>org.apache.myfaces.tobago.example.demo.OnOffConverter</converter-id>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
index ecae9e2..f69c318 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
@@ -100,6 +100,7 @@
   </listener>
 -->
 
+<!--
   <filter>
     <filter-name>LoggingMdcFilter</filter-name>
     <filter-class>org.apache.myfaces.tobago.internal.webapp.LoggingMdcFilter</filter-class>
@@ -108,6 +109,7 @@
     <filter-name>LoggingMdcFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
+-->
 
   <!-- FacesServlet -->
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
index bc01f0f..26878b0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
@@ -30,8 +30,8 @@
         <f:facet name="layout">
           <tc:gridLayout columns="1fr 1fr"/>
         </f:facet>
-        <tc:selectBooleanCheckbox value="#{attribute.condition}"/>
-        <tc:button label="update" action="#{attribute.update}"/>
+        <tc:selectBooleanCheckbox value="#{attributeController.condition}"/>
+        <tc:button label="update" action="#{attributeController.update}"/>
       </tc:panel>
 
       <tc:label value="simple output"/>
@@ -41,34 +41,34 @@
 
       <tc:label value="output over EL"/>
       <tc:in readonly="true">
-        <tc:attribute name="value" value="#{attribute.counter}"/>
+        <tc:attribute name="value" value="#{attributeController.counter}"/>
       </tc:in>
 
       <tc:label value="action"/>
       <tc:button label="Click">
-        <tc:attribute name="action" value="#{attribute.reload}"/>
+        <tc:attribute name="action" value="#{attributeController.reload}"/>
       </tc:button>
 
-      <tc:label value="conditional action (#{attribute.condition})"/>
+      <tc:label value="conditional action (#{attributeController.condition})"/>
       <tc:button label="Click">
-        <c:if test="${attribute.condition}">
-          <tc:attribute name="action" value="#{attribute.reload}"/>
+        <c:if test="${attributeController.condition}">
+          <tc:attribute name="action" value="#{attributeController.reload}"/>
         </c:if>
       </tc:button>
 
-      <tc:label value="conditional action not (#{not attribute.condition})"/>
+      <tc:label value="conditional action not (#{not attributeController.condition})"/>
       <tc:button label="Click">
-        <c:if test="${not attribute.condition}">
-          <tc:attribute name="action" value="#{attribute.reload}"/>
+        <c:if test="${not attributeController.condition}">
+          <tc:attribute name="action" value="#{attributeController.reload}"/>
         </c:if>
       </tc:button>
 
-      <tc:label value="conditional action (#{attribute.condition}) and outcome not (#{not attribute.condition})"/>
+      <tc:label value="conditional action (#{attributeController.condition}) and outcome not (#{not attributeController.condition})"/>
       <tc:button label="Click">
-        <c:if test="${attribute.condition}">
-          <tc:attribute name="action" value="#{attribute.reload}"/>
+        <c:if test="${attributeController.condition}">
+          <tc:attribute name="action" value="#{attributeController.reload}"/>
         </c:if>
-        <c:if test="${not attribute.condition}">
+        <c:if test="${not attributeController.condition}">
           <tc:attribute name="outcome" value="/content/10-intro/intro.xhtml"/>
         </c:if>
       </tc:button>
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
index 8562bc1..9a6d054 100644
--- 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
@@ -40,7 +40,7 @@
         </f:facet>
 
         <tc:panel/>
-        <tc:button label="Error" action="#{errorTest.error}"/>
+        <tc:button label="Error" action="#{errorController.error}"/>
       </tc:panel>
 
     </tc:box>
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
index d74e168..47a7da8 100644
--- 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
@@ -46,15 +46,15 @@
         </p>
       </tc:panel>
       <tc:messages/>
-      <c:forEach var="panel" items="#{dynamic.panels}">
+      <c:forEach var="panel" items="#{dynamicController.panels}">
         <ui:include src="#{panel.name}"/>
       </c:forEach>
       <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout columns="100px 100px 1fr" rows="auto"/>
         </f:facet>
-        <tc:button label="Next" action="#{dynamic.addPanel}"/>
-        <tc:button label="Reset" immediate="true" action="#{dynamic.reset}"/>
+        <tc:button label="Next" action="#{dynamicController.addPanel}"/>
+        <tc:button label="Reset" immediate="true" action="#{dynamicController.reset}"/>
       </tc:panel>
     </tc:box>
   </tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-one-fragment.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml
similarity index 94%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-one-fragment.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml
index 761ee5c..afd1ab4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-one-fragment.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-1.xhtml
@@ -28,6 +28,6 @@
       <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
     </f:facet>
     <tc:separator label="Panel One"/>
-    <tc:in label="Value One" value="#{panel1.value}" />
+    <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/panel-two-fragment.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml
similarity index 88%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-two-fragment.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml
index 40f8f78..d30757e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-two-fragment.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-2.xhtml
@@ -28,7 +28,7 @@
       <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
     </f:facet>
     <tc:separator label="Panel Two"/>
-    <tc:in label="First Name" value="#{panel2.firstName}" />
-    <tc:in label="Second Name" value="#{panel2.secondName}" />
+    <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/panel-three-fragment.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml
similarity index 89%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-three-fragment.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml
index 2a46c0f..21898ee 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/panel-three-fragment.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/x-panel-3.xhtml
@@ -28,7 +28,7 @@
       <tc:gridLayout margin="10px" columns="500px" rows="auto auto"/>
     </f:facet>
     <tc:separator label="Panel Three"/>
-    <tc:in label="Street" value="#{panel3.street}" />
-    <tc:in label="City" value="#{panel3.city}" />
+    <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/hidden/hidden.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/hidden/hidden.xhtml
index d80320c..ac05bc1 100644
--- 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
@@ -30,17 +30,17 @@
 
     <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="#{hidden.value1}"/>
+    <tc:hidden id="h1" value="#{hiddenController.value1}"/>
     <tc:in label="Value of the hidden field 1 on server"
-           labelWidth="350px" value="#{hidden.value1}" disabled="true"/>
+           labelWidth="350px" value="#{hiddenController.value1}" disabled="true"/>
     
-    <tc:hidden id="h2" value="#{hidden.value2}" rendered="false"/>
+    <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="#{hidden.value2}" disabled="true"/>
+           labelWidth="350px" value="#{hiddenController.value2}" disabled="true"/>
     
-    <tc:hidden id="h3" value="#{hidden.value3}" rendered="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="#{hidden.value3}" disabled="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..."/>
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
index 75c898c..67883bb 100644
--- 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
@@ -32,7 +32,7 @@
 
       <tc:messages id="mymessages" confirmation="true"/>
 
-      <tc:button label="Please click to show the messages" action="#{messages.createMessages}"/>
+      <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/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
index 33caa35..e9c4bbd 100644
--- 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
@@ -38,7 +38,7 @@
       &lt;li>Check if the readonly value has been changed&lt;/li>
       &lt;/ol>"/>
 
-      <tc:in label="Readonly Value" value="#{popupData.value}" readonly="true" fieldId="readonly"/>
+      <tc:in label="Readonly Value" value="#{popupDataController.value}" readonly="true" fieldId="readonly"/>
 
       <tc:panel>
         <f:facet name="layout">
@@ -51,7 +51,7 @@
                 <f:facet name="layout">
                   <tc:gridLayout rows="1fr auto"/>
                 </f:facet>
-                <tc:in label="Edit Value" value="#{popupData.value}" fieldId="in"/>
+                <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"/>
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
index a148e2f..61b1e0e 100644
--- 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
@@ -288,9 +288,9 @@
     <f:facet name="layout">
       <tc:gridLayout columns="1fr 1fr"/>
     </f:facet>
-    <tc:selectBooleanCheckbox label="1st Popup Modal" value="#{zIndex.modal1}" id="modal1st"/>
+    <tc:selectBooleanCheckbox label="1st Popup Modal" value="#{zIndexController.modal1}" id="modal1st"/>
     <tc:panel/>
-    <tc:selectBooleanCheckbox label="2nd Popup Modal" value="#{zIndex.modal2}"/>
+    <tc:selectBooleanCheckbox label="2nd Popup Modal" value="#{zIndexController.modal2}"/>
     <tc:panel/>
   </tc:panel>
   <tc:panel>
@@ -299,7 +299,7 @@
     </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="#{zIndex.modal1}">
+        <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"/>
@@ -323,7 +323,7 @@
               </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="#{zIndex.modal2}">
+                  <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"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/resource/resource-manager.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/resource/resource-manager.xhtml
index 3bfc5bc..2e326cb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/resource/resource-manager.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/resource/resource-manager.xhtml
@@ -28,12 +28,12 @@
     </f:facet>
     <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
 
-    <tc:in label="Fails" markup="#{resourceBean.fails == 2 ? '' : 'error' }"
-           value="#{resourceBean.fails}" tip="expected are 2"/>
+    <tc:in label="Fails" markup="#{resourceBeanController.fails == 2 ? '' : 'error' }"
+           value="#{resourceBeanController.fails}" tip="expected are 2"/>
 
     <tc:messages/>
 
-    <tc:sheet columns="3fr 1fr 1fr 3fr" value="#{resourceBean.resultList}" var="item">
+    <tc:sheet columns="3fr 1fr 1fr 3fr" value="#{resourceBeanController.resultList}" var="item">
       <tc:column label="Name">
         <tc:out value="#{item.name}"/>
       </tc:column>
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
index a31ead4..8411a7c 100644
--- 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
@@ -46,7 +46,7 @@
       <tc:out value="TODO: write an automated tests."/>
 
       <tc:button label="No Action"/>
-      <tc:button label="Action" action="#{scriptEvent.action}"/>
+      <tc:button label="Action" action="#{scriptEventController.action}"/>
       <tc:button label="External link" link="http://www.apache.org" target="_blank"/>
 
     </tc:box>
@@ -60,7 +60,7 @@
         <f:ajax render="list" execute="list"/>
       </tc:button>
 
-      <tc:sheet value="#{scriptEvent.items}" var="item">
+      <tc:sheet value="#{scriptEventController.items}" var="item">
         <tc:column label="Event">
           <tc:out value="#{item.name}"/>
         </tc:column>
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
index d83a4d4..1df26f5 100644
--- 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
@@ -24,7 +24,7 @@
   <tc:page id="page">
 
     <tc:segmentLayout medium="2seg 4seg 2seg 4seg" small="6seg 6seg">
-      <tc:in label="1st label" value="#{bootstrap.value}" labelLayout="segmentLeft"/>
+      <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>
@@ -35,9 +35,9 @@
     </tc:segmentLayout>
 
     <tc:segmentLayout medium="1seg 1seg 1seg" extraSmall="4seg 4seg 4seg">
-      <tc:button id="cancel" label="Cancel" action="#{bootstrap.reset}"/>
-      <tc:button id="save" label="Save" action="#{bootstrap.save}"/>
-      <tc:button id="delete" label="Delete" action="#{bootstrap.delete}"/>
+      <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>
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
index 9848409..cf575e4 100644
--- 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
@@ -23,9 +23,8 @@
     xmlns:f="http://java.sun.com/jsf/core">
 
   <tc:page id="page">
-    <!-- <tc:gridLayoutConstraint width="600px" height="600px"/> -->
 
-    <tc:sheet value="#{sort.list}" id="sheet" columns="1fr 1fr 1fr 1fr 1fr 1fr" var="entry">
+    <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>
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
index 47498df..0e40762 100644
--- 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
@@ -27,7 +27,7 @@
       <tc:gridLayout rows="1fr auto"/>
     </f:facet>
 
-    <tc:sheet value="#{tree.tree}" id="sheet" columns="1fr 1fr" var="row" showRoot="true" showRootJunction="true">
+    <tc:sheet value="#{treeTestController.tree}" id="sheet" columns="1fr 1fr" var="row" showRoot="true" showRootJunction="true">
 
       <tc:columnNode label="Tree" id="tree">
         <tc:treeIndent/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-command.xhtml
index 43200ce..250a343 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-command.xhtml
@@ -30,7 +30,7 @@
 
     <tc:out value="Tree with commands as nodes:"/>
 
-    <tc:tree id="tree" value="#{tree.tree}" var="node" showRoot="true" showRootJunction="true">
+    <tc:tree id="tree" value="#{treeTestController.tree}" var="node" showRoot="true" showRootJunction="true">
       <tc:treeNode id="node">
         <tc:treeIndent/>
         <tc:treeCommand label="#{node.userObject.name}" action="#{node.userObject.action}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-expanded.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-expanded.xhtml
index 9b978ad..42bde5a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-expanded.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-expanded.xhtml
@@ -29,9 +29,9 @@
 
     <tc:out value="Test expanded state of the tree nodes:"/>
 
-    <tc:button label="Reset" action="#{tree.openAll}" id="reset" immediate="true"/>
+    <tc:button label="Reset" action="#{treeTestController.openAll}" id="reset" immediate="true"/>
 
-    <tc:tree id="tree" value="#{tree.tree}" state="#{tree.state}" var="node" showRoot="true" showRootJunction="true">
+    <tc:tree id="tree" value="#{treeTestController.tree}" state="#{treeTestController.state}" var="node" showRoot="true" showRootJunction="true">
       <tc:treeNode id="node">
         <tc:treeIndent id="indent"/>
         <tc:treeCommand id="command" label="#{node.userObject.name}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-infinite.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-infinite.xhtml
index 85e686e..76accba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-infinite.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-infinite.xhtml
@@ -35,7 +35,7 @@
       <tc:link label="Cantor set" link="http://en.wikipedia.org/wiki/Cantor_set"/>
     </tc:panel>
 
-    <tc:tree id="tree" value="#{tree.infinite}" var="interval" showRoot="true" showRootJunction="true">
+    <tc:tree id="tree" value="#{treeTestController.infinite}" var="interval" showRoot="true" showRootJunction="true">
       <tc:treeNode id="node">
         <tc:treeIndent/>
         <tc:treeLabel value="#{interval.label}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-with-model.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-with-model.xhtml
index faed9d8..ebe6084 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-with-model.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-with-model.xhtml
@@ -39,8 +39,8 @@
     &lt;li>Check: Only the Sports node should be marked&lt;/li>
     &lt;/ol>"/>
 
-    <tc:tree id="tree" value="#{tree.tree}" var="node" showRoot="true" showRootJunction="true"
-        state="#{tree.state}">
+    <tc:tree id="tree" value="#{treeTestController.tree}" var="node" showRoot="true" showRootJunction="true"
+             state="#{treeTestController.state}">
       <tc:treeNode id="node">
         <tc:treeIndent id="indent"/>
         <tc:treeCommand label="#{node.userObject.name}" id="command"/>
@@ -54,7 +54,7 @@
 
       <tc:panel/>
       <tc:button id="reload" link="#{request.pathInfo}" label="Reload with fresh view"/>
-      <tc:button id="clear" action="#{tree.clearSelected}" label="Reload with fresh view"/>
+      <tc:button id="clear" action="#{treeTestController.clearSelected}" label="Reload with fresh view"/>
 
     </tc:panel>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-without-model.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-without-model.xhtml
index 0e6f418..88a8345 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-without-model.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-marked-without-model.xhtml
@@ -39,7 +39,7 @@
     &lt;li>Check: Only the Sports node should be marked&lt;/li>
     &lt;/ol>"/>
 
-    <tc:tree id="tree" value="#{tree.tree}" var="node" showRoot="true" showRootJunction="true">
+    <tc:tree id="tree" value="#{treeTestController.tree}" var="node" showRoot="true" showRootJunction="true">
       <tc:treeNode id="node">
         <tc:treeIndent id="indent"/>
         <tc:treeCommand label="#{node.userObject.name}" id="command"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-state.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-state.xhtml
index 279338f..7d7b84e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-state.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-state.xhtml
@@ -29,7 +29,7 @@
 
     <tc:out value="Stores the selection value in the state object of the tree."/>
 
-    <tc:tree id="tree" selectable="single" showRoot="true" showRootJunction="true" value="#{tree.tree}" var="node">
+    <tc:tree id="tree" selectable="single" showRoot="true" showRootJunction="true" value="#{treeTestController.tree}" var="node">
       <tc:treeNode id="template">
         <tc:treeIndent/>
         <tc:treeSelect id="select" label="#{node.userObject.name}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-value.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-value.xhtml
index 4f3ded5..3c6d2c9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-value.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-select-via-value.xhtml
@@ -30,7 +30,7 @@
     <tc:out value="Stores the selection value in the value attribute of the tc:treeSelect component."/>
 
     <tc:tree id="tree" selectable="single" showRoot="true" showRootJunction="true"
-             value="#{tree.tree}" state="#{tree.state}" var="node">
+             value="#{treeTestController.tree}" state="#{treeTestController.state}" var="node">
       <tc:treeNode id="template">
         <tc:treeIndent/>
         <tc:treeSelect id="select" label="#{node.userObject.name}" value="#{node.userObject.selected}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-show-attributes.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-show-attributes.xhtml
index 3283baf..24d7401 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-show-attributes.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-show-attributes.xhtml
@@ -64,16 +64,16 @@
 
     </tc:panel>
 
-    <c:forEach items="#{trueAndFalseList}" var="showRoot">
-      <c:forEach items="#{trueAndFalseList}" var="showRootJunction">
-        <c:forEach items="#{trueAndFalseList}" var="showJunctions">
-          <c:forEach items="#{trueAndFalseList}" var="showIcons">
+    <c:forEach items="#{trueAndFalseListController}" var="showRoot">
+      <c:forEach items="#{trueAndFalseListController}" var="showRootJunction">
+        <c:forEach items="#{trueAndFalseListController}" var="showJunctions">
+          <c:forEach items="#{trueAndFalseListController}" var="showIcons">
 
             <tc:box
                 label="#{showRoot}, #{showRootJunction}, #{showJunctions}, #{showIcons}"
                 tip="show root = #{showRoot}, show root junctions = #{showRootJunction}, show junctions = #{showJunctions}, show icons = #{showIcons}">
               <tc:tree showRoot="#{showRoot}" showRootJunction="#{showRootJunction}"
-                       value="#{tree.small}" var="node">
+                       value="#{treeTestController.small}" var="node">
                   <tc:treeNode id="template">
                     <tc:treeIndent showJunctions="#{showJunctions}"/>
                     <tc:treeIcon rendered="#{showIcons}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-simple.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-simple.xhtml
index 2a5be62..701c881 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-simple.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/tree/tree-simple.xhtml
@@ -29,8 +29,8 @@
 
     <tc:out value="Simple tree:"/>
 
-    <tc:tree id="tree" value="#{tree.tree}" var="node" showRoot="true" showRootJunction="true"
-             state="#{tree.state}">
+    <tc:tree id="tree" value="#{treeTestController.tree}" var="node" showRoot="true" showRootJunction="true"
+             state="#{treeTestController.state}">
       <tc:treeNode id="node">
         <tc:treeIndent/>
         <tc:treeIcon/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/treeListbox/treeListbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/treeListbox/treeListbox.xhtml
index fe8ea72..fb4720d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/treeListbox/treeListbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/treeListbox/treeListbox.xhtml
@@ -25,7 +25,7 @@
   <tc:page>
     <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
 
-    <tc:treeListbox id="tree" value="#{tree.tree}" var="node">
+    <tc:treeListbox id="tree" value="#{treeTestController.tree}" var="node">
       <tc:treeNode id="template">
         <tc:treeLabel value="#{node.userObject.name}"/>
       </tc:treeNode>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.xhtml
index 1a2b2e5..1f7b738 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/mode-valueIfSet.xhtml
@@ -55,7 +55,7 @@
           <tc:attribute name="value" value="#{value3}" mode="valueIfSet"/>
         </tc:in>
 
-        <c:set var="value4" value="#{attribute.value}"/>
+        <c:set var="value4" value="#{attributeController.value}"/>
         <tc:label value="java session variable"/>
         <tc:in id="v4" label="value from model" labelLayout="segmentRight">
           <tc:attribute name="value" value="#{value4}" mode="valueIfSet"/>

-- 
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.

Mime
View raw message