svn commit: r1587479 [4/6] - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-assembly/ tobago-core/ tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/ tobago-core/src/m...

[lo...@apache.org]

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Render a set of radio buttons.
@@ -37,163 +34,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneRadioExtensionHandler")
-public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression converter;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression renderRange;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private javax.el.ValueExpression markup;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectOneRadioTag selectOneRadioTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectOneRadioTag = new SelectOneRadioTag();
-    selectOneRadioTag.setPageContext(pageContext);
-    if (value != null) {
-      selectOneRadioTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectOneRadioTag.setValueChangeListener(valueChangeListener);
-    }
-    if (validator != null) {
-      selectOneRadioTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectOneRadioTag.setConverter(converter);
-    }
-    if (binding != null) {
-      selectOneRadioTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectOneRadioTag.setOnchange(onchange);
-    }
-    if (disabled != null) {
-      selectOneRadioTag.setDisabled(disabled);
-    }
-    if (inline != null) {
-      selectOneRadioTag.setInline(inline);
-    }
-    if (focus != null) {
-      selectOneRadioTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectOneRadioTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectOneRadioTag.setLabel(label);
-    }
-    if (readonly != null) {
-      selectOneRadioTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectOneRadioTag.setRequired(required);
-    }
-    if (tabIndex != null) {
-      selectOneRadioTag.setTabIndex(tabIndex);
-    }
-    if (renderRange != null) {
-      selectOneRadioTag.setRenderRange(renderRange);
-    }
-    if (validatorMessage != null) {
-      selectOneRadioTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectOneRadioTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectOneRadioTag.setRequiredMessage(requiredMessage);
-    }
-    if (markup != null) {
-      selectOneRadioTag.setMarkup(markup);
-    }
-
-    selectOneRadioTag.setParent(labelTag);
-    selectOneRadioTag.setJspId(nextJspId());
-    selectOneRadioTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectOneRadioTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    inline = null;
-    label = null;
-    labelWidth = null;
-    converter = null;
-    validator = null;
-    readonly = null;
-    rendered = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    tabIndex = null;
-    selectOneRadioTag = null;
-    labelTag = null;
-    focus = null;
-    renderRange = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    markup = null;
-    fieldId = null;
-  }
+public interface SelectOneRadioExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -202,35 +43,27 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * A method binding EL expression,
@@ -242,36 +75,28 @@ public class SelectOneRadioExtensionTag 
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -285,17 +110,13 @@ public class SelectOneRadioExtensionTag 
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
   /**
    * Flag indicating this component should rendered as an inline element.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setInline(final javax.el.ValueExpression inline) {
-    this.inline = inline;
-  }
+  public void setInline(final javax.el.ValueExpression inline) ;
 
   /**
    * Text value to display as label.
@@ -303,9 +124,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -313,9 +132,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -323,18 +140,14 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -343,60 +156,46 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * Range of items to render.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRenderRange(final javax.el.ValueExpression renderRange) {
-    this.renderRange = renderRange;
-  }
+  public void setRenderRange(final javax.el.ValueExpression renderRange) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * Indicate markup of this component.
@@ -404,9 +203,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -414,9 +211,7 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -426,7 +221,5 @@ public class SelectOneRadioExtensionTag 
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -23,12 +23,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.Facets;
-import org.apache.myfaces.tobago.internal.taglib.LabelTag;
-import org.apache.myfaces.tobago.internal.taglib.SeparatorTag;
-
-import javax.faces.webapp.FacetTag;
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a separator.
@@ -50,72 +44,15 @@ import javax.servlet.jsp.JspException;
     componentType = "org.apache.myfaces.tobago.Separator",
     rendererType = "Separator",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SeparatorExtensionHandler")
-public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
+public interface SeparatorExtensionTag {
   
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression label;
-
-  private SeparatorTag separatorTag;
-  private FacetTag facetTag;
-  private LabelTag labelTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-    separatorTag = new SeparatorTag();
-    separatorTag.setPageContext(pageContext);
-    separatorTag.setParent(getParent());
-    if (binding != null) {
-      separatorTag.setBinding(binding);
-    }
-    if (rendered != null) {
-      separatorTag.setRendered(rendered);
-    }
-    facetTag = new FacetTag();
-    facetTag.setPageContext(pageContext);
-    facetTag.setParent(separatorTag);
-    facetTag.setName(Facets.LABEL);
-
-    facetTag.doStartTag();
-    labelTag = new LabelTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setParent(facetTag);
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    labelTag.doEndTag();
-    facetTag.doEndTag();
-    separatorTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    rendered = null;
-    label = null;
-    separatorTag = null;
-    facetTag = null;
-    labelTag = null;
-  }
-
   /**
    * The value binding expression linking this
    * component to a property in a backing bean.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) throws JspException {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding);
   
   /**
    * Flag indicating whether or not this component should be rendered
@@ -123,9 +60,7 @@ public class SeparatorExtensionTag exten
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * Text value to display as label.
@@ -133,7 +68,5 @@ public class SeparatorExtensionTag exten
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.TextareaTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a multi line text input control with a label.
@@ -50,179 +47,27 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.TextareaTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TextareaExtensionHandler")
-public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression converter;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private TextareaTag textareaTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setRows("*");
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    textareaTag = new TextareaTag();
-    textareaTag.setPageContext(pageContext);
-    if (value != null) {
-      textareaTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      textareaTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      textareaTag.setBinding(binding);
-    }
-    if (converter != null) {
-      textareaTag.setConverter(converter);
-    }
-    if (validator != null) {
-      textareaTag.setValidator(validator);
-    }
-    if (onchange != null) {
-      textareaTag.setOnchange(onchange);
-    }
-    if (disabled != null) {
-      textareaTag.setDisabled(disabled);
-    }
-    if (focus != null) {
-      textareaTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      textareaTag.setId(fieldId);
-    }
-    if (label != null) {
-      textareaTag.setLabel(label);
-    }
-    if (readonly != null) {
-      textareaTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      textareaTag.setRequired(required);
-    }
-    if (markup != null) {
-      textareaTag.setMarkup(markup);
-    }
-    if (tabIndex != null) {
-      textareaTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      textareaTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      textareaTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      textareaTag.setRequiredMessage(requiredMessage);
-    }
-    textareaTag.setParent(labelTag);
-    textareaTag.setJspId(nextJspId());
-    textareaTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    textareaTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    converter = null;
-    validator = null;
-    disabled = null;
-    labelWidth = null;
-    focus = null;
-    label = null;
-    readonly = null;
-    rendered = null;
-    required = null;
-    tip = null;
-    value = null;
-    onchange = null;
-    markup = null;
-    valueChangeListener = null;
-    tabIndex = null;
-    textareaTag = null;
-    labelTag = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface TextareaExtensionTag {
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Text value to display as label.
@@ -230,18 +75,14 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * The value binding expression linking this
@@ -249,9 +90,7 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -259,9 +98,7 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -275,9 +112,7 @@ public class TextareaExtensionTag extend
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * A method binding EL expression,
@@ -289,18 +124,14 @@ public class TextareaExtensionTag extend
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Indicate markup of this component.
@@ -308,27 +139,21 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that a value is required.
@@ -337,18 +162,14 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
    /**
    * The width for the label component. Default: 'auto'.
@@ -357,42 +178,32 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -400,9 +211,7 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -412,7 +221,5 @@ public class TextareaExtensionTag extend
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.TimeTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a time input field with a label.
@@ -48,158 +45,8 @@ import javax.servlet.jsp.JspException;
 @Tag(name = "time")
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag",
-        faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
-public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private TimeTag timeTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    timeTag = new TimeTag();
-    timeTag.setPageContext(pageContext);
-    if (value != null) {
-      timeTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      timeTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      timeTag.setBinding(binding);
-    }
-    /*if (converter != null) {
-      timeTag.setConverter(converter);
-    }*/
-    if (validator != null) {
-      timeTag.setValidator(validator);
-    }
-    if (onchange != null) {
-      timeTag.setOnchange(onchange);
-    }
-    if (disabled != null) {
-      timeTag.setDisabled(disabled);
-    }
-    if (focus != null) {
-      timeTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      timeTag.setId(fieldId);
-    }
-    if (label != null) {
-      timeTag.setLabel(label);
-    }
-    if (inline != null) {
-      timeTag.setInline(inline);
-    }
-    if (readonly != null) {
-      timeTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      timeTag.setRequired(required);
-    }
-    if (markup != null) {
-      timeTag.setMarkup(markup);
-    }
-    if (tabIndex != null) {
-      timeTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      timeTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      timeTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      timeTag.setRequiredMessage(requiredMessage);
-    }
-    timeTag.setParent(labelTag);
-    timeTag.setJspId(nextJspId());
-    timeTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    timeTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    converter = null;
-    validator = null;
-    disabled = null;
-    labelWidth = null;
-    focus = null;
-    label = null;
-    inline = null;
-    readonly = null;
-    rendered = null;
-    required = null;
-    tip = null;
-    value = null;
-    onchange = null;
-    valueChangeListener = null;
-    markup = null;
-    tabIndex = null;
-    timeTag = null;
-    labelTag = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
+public interface TimeExtensionTag {
 
   /**
    * Indicate markup of this component.
@@ -207,35 +54,27 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
-          type = {},
-          expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
-          methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+      type = {},
+      expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
+      methodSignature = "javax.faces.event.ValueChangeEvent")
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Text value to display as label.
@@ -243,18 +82,14 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * The value binding expression linking this
@@ -262,9 +97,7 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -272,9 +105,7 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -288,9 +119,7 @@ public class TimeExtensionTag extends To
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * A method binding EL expression,
@@ -301,48 +130,39 @@ public class TimeExtensionTag extends To
   @TagAttribute
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
-      methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+      methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Flag indicating this component should rendered as an inline element.
+   *
    * @deprecated This should be handled by e.g. a flow layout manager (since 1.5.0)
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
   @Deprecated
-  public void setInline(final javax.el.ValueExpression inline) {
-    this.inline = inline;
-  }
+  public void setInline(final javax.el.ValueExpression inline) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that a value is required.
@@ -351,18 +171,14 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -371,42 +187,32 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -414,9 +220,7 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -426,7 +230,5 @@ public class TimeExtensionTag extends To
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Tue Apr 15 09:13:03 2014
@@ -66,7 +66,6 @@ import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;
 import javax.faces.render.Renderer;
 import javax.faces.view.facelets.FaceletContext;
-import javax.servlet.jsp.JspException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -612,7 +611,7 @@ public final class ComponentUtils {
    * @deprecated since 2.0.0
    */
   @Deprecated
-  public static ActionListener createActionListener(final String type) throws JspException {
+  public static ActionListener createActionListener(final String type) {
     try {
       ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
       if (classLoader == null) {

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/web-fragment.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/web-fragment.xml?rev=1587479&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/web-fragment.xml (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/web-fragment.xml Tue Apr 15 09:13:03 2014
@@ -0,0 +1,35 @@
+<?xml version="1.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.
+-->
+
+<web-fragment
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
+    version="3.0">
+
+  <name>TobagoCore</name>
+
+  <listener>
+    <listener-class>org.apache.myfaces.tobago.webapp.TobagoServletContextListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.tobago.webapp.SecretSessionListener</listener-class>
+  </listener>
+
+</web-fragment>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml Tue Apr 15 09:13:03 2014
@@ -59,39 +59,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xml-maven-plugin</artifactId>
-        <version>1.0-beta-3</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>transform</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <transformationSets>
-            <transformationSet>
-              <dir>src/main/webapp</dir>
-              <outputDir>${project.build.directory}/tobago-example-demo</outputDir>
-              <stylesheet>src/main/xslt/facelet2jsp.xsl</stylesheet>
-              <includes>
-                <include>init.xhtml</include>
-                <include>content/**/*.xhtml</include>
-                <include>reference/**/*.xhtml</include>
-              </includes>
-              <fileMappers>
-                <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
-                  <pattern>(.*).xhtml</pattern>
-                  <replacement>$1.jspx</replacement>
-                </fileMapper>
-              </fileMappers>
-            </transformationSet>
-          </transformationSets>
-        </configuration>
-      </plugin>
-      <plugin>
         <!-- TODO test glassfish -->
         <groupId>org.glassfish</groupId>
         <artifactId>maven-embedded-glassfish-plugin</artifactId>
@@ -644,7 +611,7 @@
             <version>2.9</version>
             <configuration>
               <configLocation>META-INF/checkstyle-tobago.xml</configLocation>
-              <includes>**/*.xhtml,**/*.jsp,**/*.tag</includes>
+              <includes>**/*.xhtml</includes>
               <excludes>**/*.java</excludes>
               <sourceDirectory>src/main/webapp</sourceDirectory>
             </configuration>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BirdController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BirdController.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BirdController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BirdController.java Tue Apr 15 09:13:03 2014
@@ -19,16 +19,15 @@
 
 package org.apache.myfaces.tobago.example.demo;
 
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-/*
-// XXX This doesn't work with CODI in the JSP version
 @SessionScoped
 @Named(value = "birdController")
-*/
 public class BirdController implements Serializable {
 
   private List<Bird> birds = new ArrayList<Bird>(Arrays.asList(

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java Tue Apr 15 09:13:03 2014
@@ -19,7 +19,7 @@
 
 package org.apache.myfaces.tobago.example.demo;
 
-import org.apache.myfaces.tobago.example.demo.jsp.JspFormatter;
+import org.apache.myfaces.tobago.example.demo.formatter.SourceFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -130,9 +130,6 @@ public class NavigationTree implements S
   }
 
   public NavigationNode findByViewId(String viewId) {
-    if (viewId.endsWith(".jspx")) {
-      viewId = viewId.substring(0, viewId.lastIndexOf(".jspx")) + ".xhtml";
-    }
     final Enumeration enumeration = tree.depthFirstEnumeration();
     while (enumeration.hasMoreElements()) {
       final NavigationNode node = ((NavigationNode) enumeration.nextElement());
@@ -161,7 +158,7 @@ public class NavigationTree implements S
     try {
       final InputStream resourceAsStream = externalContext.getResourceAsStream(viewId);
       final InputStreamReader reader = new InputStreamReader(resourceAsStream);
-      JspFormatter.writeJsp(reader, new PrintWriter(response.getOutputStream()));
+      SourceFormatter.writeJsp(reader, new PrintWriter(response.getOutputStream()));
     } catch (final IOException e) {
       LOG.error("", e);
       return "error";

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Tue Apr 15 09:13:03 2014
@@ -61,8 +61,6 @@ public class TobagoDemoController implem
   // XXX jetty 6.1.22 has problems with boolean[] (primitive), see: http://jira.codehaus.org/browse/JETTY-1181
   private Boolean[] bool;
 
-  private boolean update;
-
   private Boolean boolTest;
 
   private String[] text;
@@ -179,45 +177,6 @@ public class TobagoDemoController implem
     toolbarTextPosition = UIToolBar.LABEL_BOTTOM;
   }
 
-
-  public boolean isUpdate() {
-    update = !update;
-    return update;
-  }
-
-  public boolean isJsp() {
-    final String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
-    final int end = viewId.lastIndexOf(".xhtml");
-    return end < 0;
-  }
-
-  public boolean isDoubleDefined() {
-    final String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
-    final String name = viewId.substring(1, viewId.lastIndexOf("."));
-    final String path = ResourceManagerUtils.getImageWithPath(FacesContext.getCurrentInstance(), name + ".xhtml", true);
-    return path != null;
-  }
-
-  public String asJsp() {
-    final String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
-    final int end = viewId.lastIndexOf(".xhtml");
-    if (end >= 0) {
-      return viewId.substring(1, end) + ".jspx";
-    }
-    LOG.warn("Can't create the outcome");
-    return null;
-  }
-
-  public String asFacelet() {
-    final String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
-    final int end = viewId.lastIndexOf(".jspx");
-    if (end >= 0) {
-      return viewId.substring(1, end) + ".xhtml";
-    }
-    LOG.warn("Can't create the outcome");
-    return null;
-  }
-
   public String resetSession() throws IOException {
     LOG.info("Resetting the session.");
     final FacesContext facesContext = FacesContext.getCurrentInstance();

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/AbstractConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/AbstractConverter.java?rev=1587479&r1=1587458&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/AbstractConverter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/AbstractConverter.java Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/Converter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/Converter.java?rev=1587479&r1=1587458&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/Converter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/Converter.java Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
 public interface Converter {
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspTagConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspTagConverter.java?rev=1587479&r1=1587458&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspTagConverter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspTagConverter.java Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,9 +38,10 @@ public class JspTagConverter extends Abs
   public Pattern initPattern() throws MalformedPatternException {
 //    return compiler.compile("(?s)<%.*?%>");
 //    return compiler.compile("(?s)<%(--)?.*?\\1%>");
-    return getCompiler().compile("(?s)(<%--.*?--%>)|(<%.*?%>)");
+    return getCompiler().compile("(?s)(<!--.*?-->)");
   }
 
+/*
   public String highlightJavaKeyword(final String java) {
     return getUtil().substitute("s/(\\bassert\\b|break\\b|\\bbyte\\b|\\bboolean\\b"
         + "|\\bcatch\\b|\\bcase\\b|\\bchar\\b|\\bcontinue\\b|\\bdouble\\b"
@@ -53,9 +54,10 @@ public class JspTagConverter extends Abs
         + "|\\bthrow\\b|\\bthrows\\b|\\bvoid\\b|\\bwhile\\b)"
         + "/<span class=\"keyword\">$1<\\/span>/g", java);
   }
+*/
 
   public String convertMatch(final String fragment) {
-    final String key = "tag" + tags.size();;
+    final String key = "tag" + tags.size();
     String tag = XmlUtils.escape(fragment, false);
     if (fragment.startsWith("<%--")) {
       tag = "<span class=\"jsp-comment\">" + tag + "</span>";
@@ -64,7 +66,7 @@ public class JspTagConverter extends Abs
     } else if (fragment.startsWith("<%!")) {
       // XXX temporarily hide strings to avoid keyword highlighting in strings
       tag = highlightStrings(tag);
-      tag = highlightJavaKeyword(tag);
+//      tag = highlightJavaKeyword(tag);
       tag = "<span class=\"jsp-declaration\">" + tag + "</span>";
     } else if (fragment.startsWith("<%=")) {
       tag = highlightStrings(tag);
@@ -72,7 +74,7 @@ public class JspTagConverter extends Abs
     } else if (fragment.startsWith("<%")) {
       // XXX temporarily hide strings to avoid keyword highlighting in strings
       tag = highlightStrings(tag);
-      tag = highlightJavaKeyword(tag);
+//      tag = highlightJavaKeyword(tag);
       tag = "<span class=\"jsp-tag\">" + tag + "</span>";
     } else {
       LOG.error("error: " + fragment);

Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/SourceFormatter.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/SourceFormatter.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/SourceFormatter.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/SourceFormatter.java Tue Apr 15 09:13:03 2014
@@ -17,35 +17,20 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
-import javax.servlet.jsp.JspWriter;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.PrintWriter;
 import java.io.Reader;
 
-public class JspFormatter {
+public class SourceFormatter {
 
   public static void main(final String[] args) throws Exception {
     writeJsp(new FileReader(args[0]), new PrintWriter(System.out));
   }
 
-  public static void writeJsp(final String filename, final JspWriter out)
-      throws IOException {
-    final InputStream in
-        = JspFormatter.class.getClassLoader().getResourceAsStream(filename);
-    if (in == null) {
-      throw new FileNotFoundException(
-          "Resource not found in classpath: filename = '" + filename + "'");
-    }
-    writeJsp(new InputStreamReader(in), new PrintWriter(out));
-  }
-
   public static void writeJsp(final Reader reader, final PrintWriter out)
       throws IOException {
     final JspTagConverter formatter = new JspTagConverter();

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/StringExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/StringExpression.java?rev=1587479&r1=1587458&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/StringExpression.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/StringExpression.java Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/TagConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/TagConverter.java?rev=1587479&r1=1587458&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/TagConverter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/TagConverter.java Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.tobago.example.demo.jsp;
+package org.apache.myfaces.tobago.example.demo.formatter;
 
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
@@ -31,6 +31,7 @@ public class TagConverter extends Abstra
   public String convertMatch(final String fragment) {
     // String escaped = XmlUtils.escape(fragment);
 
+    // XXX invalid
     final String withLinks = getUtil().substitute("s/^<jsp:include page=\\\"([\\-\\.\\/\\w]+)"
             + "/<jsp:include page=\\\"<a href='viewSource.jsp?jsp=$1'>$1<\\/a>/", fragment);
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/Progress.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/Progress.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/Progress.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/Progress.java Tue Apr 15 09:13:03 2014
@@ -31,7 +31,7 @@ public class Progress {
     if (update) {
       int value = progress.getValue();
       if (value < progress.getMaximum()) {
-        value = value+10;
+        value = value + 10;
         progress.setValue(value);
       }
     }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@
     version="2.0">
 
   <application>
-    <navigation-handler>
-      org.apache.myfaces.tobago.example.demo.MultiplePageDeclarationLanguageNavigationHandler
-    </navigation-handler>
     <locale-config>
       <default-locale>en</default-locale>
       <supported-locale>en_US</supported-locale>
@@ -68,12 +65,6 @@
     <managed-bean-scope>application</managed-bean-scope>
   </managed-bean>
 
-  <managed-bean>
-    <managed-bean-name>pageDeclarationLanguage</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.demo.PageDeclarationLanguageBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
   <navigation-rule>
     <navigation-case>
       <from-outcome>server-info</from-outcome>
@@ -95,14 +86,6 @@
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 
-  <!--<navigation-rule>
-    <from-view-id>/tobago-module-client/clientConfig.jsp</from-view-id>
-    <navigation-case>
-      <from-action>#{clientConfigController.submit}</from-action>
-      <to-view-id>/tobago-module-client/clientConfig.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>-->
-
   <managed-bean>
     <managed-bean-name>clientConfigController2</managed-bean-name>
     <managed-bean-class>org.apache.myfaces.tobago.example.demo.clientConfig.ClientConfigController</managed-bean-class>
@@ -124,12 +107,6 @@
   </managed-bean>
 
   <managed-bean>
-    <managed-bean-name>birdController</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.example.demo.BirdController</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-  </managed-bean>
-
-  <managed-bean>
     <managed-bean-name>transitionController</managed-bean-name>
     <managed-bean-class>org.apache.myfaces.tobago.example.demo.bestpractice.TransitionController</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
@@ -180,11 +157,11 @@
     <from-view-id>/content/12-best-practice/00/error.xhtml</from-view-id>
     <navigation-case>
       <from-outcome>error-404</from-outcome>
-      <to-view-id>/content/12-best-practice/00/x-not-existing-page.jsp</to-view-id>
+      <to-view-id>/content/12-best-practice/00/x-not-existing-page.xhtml</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>syntax</from-outcome>
-      <to-view-id>/content/12-best-practice/00/x-error-in-syntax.jsp</to-view-id>
+      <to-view-id>/content/12-best-practice/00/x-error-in-syntax.xhtml</to-view-id>
     </navigation-case>
   </navigation-rule>
 
@@ -261,10 +238,6 @@
       <to-view-id>/reference/intro.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
-      <from-outcome>reference/command</from-outcome>
-      <to-view-id>/reference/command.jsp</to-view-id>
-    </navigation-case>
-    <navigation-case>
       <from-outcome>reference/container</from-outcome>
       <to-view-id>/reference/container.jsp</to-view-id>
     </navigation-case>
@@ -300,14 +273,6 @@
       <from-outcome>reference/tool</from-outcome>
       <to-view-id>/reference/tool.jsp</to-view-id>
     </navigation-case>
-    <navigation-case>
-      <from-outcome>/reference/tree/tree-normal.jspx</from-outcome>
-      <to-view-id>/reference/tree/tree-normal.jspx</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>/reference/tree/tree-normal.xhtml</from-outcome>
-      <to-view-id>/reference/tree/tree-normal.xhtml</to-view-id>
-    </navigation-case>
 <!--
 tree-menu.xhtml
 tree-normal.xhtml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml Tue Apr 15 09:13:03 2014
@@ -194,13 +194,4 @@
     <welcome-file>index.html</welcome-file>
   </welcome-file-list>
 
-  <jsp-config>
-
-  <!--To make Umlauts possible on JSP-Pages-->
-    <jsp-property-group>
-      <url-pattern>*.jsp</url-pattern>
-      <page-encoding>UTF-8</page-encoding>
-    </jsp-property-group>
-  </jsp-config>
-
 </web-app>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/facelets-as-resources.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/facelets-as-resources.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/facelets-as-resources.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/facelets-as-resources.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/tool-bar-customizer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/tool-bar-customizer.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/tool-bar-customizer.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/tool-bar-customizer.xhtml Tue Apr 15 09:13:03 2014
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition
-    template="/WEB-INF/tags/layout/overview.xhtml"
+    template="/layout/overview.xhtml"
     xmlns:tc="http://myfaces.apache.org/tobago/component"
     xmlns:tx="http://myfaces.apache.org/tobago/extension"
     xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml Tue Apr 15 09:13:03 2014
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/layout/overview.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:tx="http://myfaces.apache.org/tobago/extension"
                 xmlns:ui="http://java.sun.com/jsf/facelets"