You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/10/25 23:24:10 UTC

svn commit: r1535874 [8/9] - in /myfaces/shared/trunk/core/src: main/java/org/apache/myfaces/shared/application/ main/java/org/apache/myfaces/shared/config/ main/java/org/apache/myfaces/shared/context/flash/ main/java/org/apache/myfaces/shared/renderki...

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/HTML.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/HTML.java?rev=1535874&r1=1535873&r2=1535874&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/HTML.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/HTML.java Fri Oct 25 21:24:09 2013
@@ -1,613 +1,613 @@
-/*
- * 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.shared.util.renderkit;
-
-import org.apache.myfaces.shared.util.ArrayUtils;
-
-
-/**
- * Constant declarations for HTML rendering.
- * @author Manfred Geiler
- * @author Anton Koinov
- * @version $Revision: 938289 $ $Date: 2010-04-26 20:35:24 -0500 (Lun, 26 Abr 2010) $
- */
-public final class HTML
-{
-
-    // Common attributes
-    public static final String ALIGN_ATTR = "align";
-    public static final String BORDER_ATTR = "border";
-    public static final String WIDTH_ATTR = "width";
-    public static final String READONLY_ATTR = "readonly";
-    public static final String FILE_ATTR = "file";
-    public static final String ACCEPT_ATTR = "accept";
-
-    // Common event handler attributes
-    public static final String ONCLICK_ATTR     = "onclick";
-    public static final String ONDBLCLICK_ATTR  = "ondblclick";
-    public static final String ONMOUSEDOWN_ATTR = "onmousedown";
-    public static final String ONMOUSEUP_ATTR   = "onmouseup";
-    public static final String ONMOUSEOVER_ATTR = "onmouseover";
-    public static final String ONMOUSEMOVE_ATTR = "onmousemove";
-    public static final String ONMOUSEOUT_ATTR  = "onmouseout";
-    public static final String ONKEYPRESS_ATTR  = "onkeypress";
-    public static final String ONKEYDOWN_ATTR   = "onkeydown";
-    public static final String ONKEYUP_ATTR     = "onkeyup";
-    public static final String ONFOCUS_ATTR = "onfocus";
-    public static final String ONBLUR_ATTR = "onblur";
-    public static final String[] EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK =
-    {
-        ONDBLCLICK_ATTR,
-        ONMOUSEDOWN_ATTR,
-        ONMOUSEUP_ATTR,
-        ONMOUSEOVER_ATTR,
-        ONMOUSEMOVE_ATTR,
-        ONMOUSEOUT_ATTR,
-        ONKEYPRESS_ATTR,
-        ONKEYDOWN_ATTR,
-        ONKEYUP_ATTR
-    };
-    public static final String[] EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
-    {
-        ONDBLCLICK_ATTR,
-        ONMOUSEDOWN_ATTR,
-        ONMOUSEUP_ATTR,
-        ONMOUSEMOVE_ATTR,
-        ONKEYPRESS_ATTR,
-        ONKEYDOWN_ATTR,
-        ONKEYUP_ATTR,
-        ONCLICK_ATTR
-    };
-    public static final String[] EVENT_HANDLER_ATTRIBUTES =
-            (String[]) ArrayUtils.concat(
-                EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
-                new String[] {ONCLICK_ATTR});
-
-    // Input field event handler attributes
-    public static final String ONSELECT_ATTR = "onselect";
-    public static final String ONCHANGE_ATTR = "onchange";
-    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES =
-    {
-        ONFOCUS_ATTR,
-        ONBLUR_ATTR,
-        ONSELECT_ATTR,
-        ONCHANGE_ATTR
-    };
-
-    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS =
-    {
-        ONBLUR_ATTR,
-        ONSELECT_ATTR,
-        ONCHANGE_ATTR
-    };
-    
-    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE =
-    {
-        ONFOCUS_ATTR,
-        ONBLUR_ATTR
-    };
-
-    // universal attributes
-    public static final String DIR_ATTR   = "dir";
-    public static final String LANG_ATTR  = "lang";
-    public static final String STYLE_ATTR = "style";
-    public static final String TITLE_ATTR = "title";
-    public static final String STYLE_CLASS_ATTR = "styleClass"; //"class" cannot be used as property name
-     
-    public static final String[] UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE =
-    {
-        DIR_ATTR,
-        LANG_ATTR,
-        TITLE_ATTR,
-
-        //NOTE: if changed, please verify universal attributes in HtmlMessageRenderer !
-    };
-    public static final String[] UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE_AND_TITLE =
-    {
-        DIR_ATTR,
-        LANG_ATTR,
-    };
-    public static final String[] UNIVERSAL_ATTRIBUTES =
-            (String[]) ArrayUtils.concat(
-                UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE,
-                new String[] {STYLE_ATTR, STYLE_CLASS_ATTR});
-
-    //universal, but not the same property-name -
-    //styleClass attribute is rendered as such
-    public static final String CLASS_ATTR = "class";
-
-    // common form field attributes
-    public static final String ACCESSKEY_ATTR   = "accesskey";
-    public static final String TABINDEX_ATTR    = "tabindex";
-    public static final String DISABLED_ATTR = "disabled";
-    public static final String[] COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED =
-    {
-        ACCESSKEY_ATTR,
-        TABINDEX_ATTR
-    };
-    public static final String[] COMMON_FIELD_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            new String[] {DISABLED_ATTR});
-
-    // Common Attributes
-    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            EVENT_HANDLER_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES);
-    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE =
-        (String[]) ArrayUtils.concat(
-            EVENT_HANDLER_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
-    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK =
-        (String[]) ArrayUtils.concat(
-            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
-            UNIVERSAL_ATTRIBUTES);
-    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
-        (String[]) ArrayUtils.concat(
-            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
-            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED =
-        (String[]) ArrayUtils.concat(
-            COMMON_PASSTROUGH_ATTRIBUTES,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            COMMON_FIELD_EVENT_ATTRIBUTES);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
-        (String[]) ArrayUtils.concat(
-            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            COMMON_FIELD_EVENT_ATTRIBUTES);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS =
-        (String[]) ArrayUtils.concat(
-            COMMON_PASSTROUGH_ATTRIBUTES,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK =
-        (String[]) ArrayUtils.concat(
-            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK =
-        (String[]) ArrayUtils.concat(
-            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
-            COMMON_FIELD_EVENT_ATTRIBUTES);
-    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
-        (String[]) ArrayUtils.concat(
-            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT,
-            UNIVERSAL_ATTRIBUTES);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            UNIVERSAL_ATTRIBUTES,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED);
-    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE,
-            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED);
-    
-    // <a>
-    public static final String TARGET_ATTR = "target";  //used by <a> and <form>
-    public static final String CHARSET_ATTR     = "charset";
-    public static final String COORDS_ATTR      = "coords";
-    public static final String HREF_ATTR    = "href";
-    public static final String HREFLANG_ATTR    = "hreflang";
-    public static final String REL_ATTR         = "rel";
-    public static final String REV_ATTR         = "rev";
-    public static final String SHAPE_ATTR       = "shape";
-    public static final String TYPE_ATTR        = "type";
-    public static final String[] ANCHOR_ATTRIBUTES =
-    {
-        ACCESSKEY_ATTR,
-        CHARSET_ATTR,
-        COORDS_ATTR,
-        HREFLANG_ATTR,
-        REL_ATTR,
-        REV_ATTR,
-        SHAPE_ATTR,
-        TABINDEX_ATTR,
-        TARGET_ATTR,
-        TYPE_ATTR
-    };
-    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            ANCHOR_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES,
-            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
-    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE =
-        (String[]) ArrayUtils.concat(
-            ANCHOR_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
-            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
-    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
-        (String[]) ArrayUtils.concat(
-            ANCHOR_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE,
-            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
-    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-            ANCHOR_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES);
-    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            ANCHOR_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
-
-    // <form>
-    public static final String ACCEPT_CHARSET_ATTR = "accept-charset";
-    public static final String ENCTYPE_ATTR = "enctype";
-    public static final String ONRESET_ATTR = "onreset";
-    public static final String ONSUMBIT_ATTR = "onsubmit";
-    public static final String[] FORM_ATTRIBUTES =
-    {
-        ACCEPT_ATTR,
-        ACCEPT_CHARSET_ATTR,
-        ENCTYPE_ATTR,
-        ONRESET_ATTR,
-        ONSUMBIT_ATTR,
-        TARGET_ATTR,
-    };
-    public static final String[] FORM_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            FORM_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES);
-    public static final String[] FORM_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-            FORM_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES);
-    // <img>
-    public static final String SRC_ATTR = "src";
-    public static final String ALT_ATTR = "alt";
-    public static final String HEIGHT_ATTR = "height";
-    public static final String HSPACE_ATTR = "hspace";
-    public static final String ISMAP_ATTR = "ismap";
-    public static final String LONGDESC_ATTR = "longdesc";
-    public static final String USEMAP_ATTR = "usemap";
-    public static final String VSPACE_ATTR = "vspace";
-
-    public static final String[] IMG_ATTRIBUTES =
-    {
-        ALIGN_ATTR,
-        ALT_ATTR,
-        BORDER_ATTR,
-        HEIGHT_ATTR,
-        HSPACE_ATTR,
-        ISMAP_ATTR,
-        LONGDESC_ATTR,
-        USEMAP_ATTR,
-        VSPACE_ATTR,
-        WIDTH_ATTR
-    };
-    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-           IMG_ATTRIBUTES,
-           COMMON_PASSTROUGH_ATTRIBUTES);
-    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
-        (String[]) ArrayUtils.concat(
-           IMG_ATTRIBUTES,
-           COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT);
-    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-           IMG_ATTRIBUTES,
-           UNIVERSAL_ATTRIBUTES);
-    // <input>
-    public static final String SIZE_ATTR = "size";
-    public static final String AUTOCOMPLETE_ATTR = "autocomplete";
-    public static final String CHECKED_ATTR = "checked";
-    public static final String MAXLENGTH_ATTR = "maxlength";
-
-    public static final String[] INPUT_ATTRIBUTES = {
-        ALIGN_ATTR,
-        ALT_ATTR,
-        CHECKED_ATTR,
-        MAXLENGTH_ATTR,
-        READONLY_ATTR,
-        SIZE_ATTR
-    };
-    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
-        (String[]) ArrayUtils.concat(
-                INPUT_ATTRIBUTES,
-                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
-    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
-        (String[]) ArrayUtils.concat(
-                INPUT_ATTRIBUTES,
-                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
-
-    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK =
-        (String[]) ArrayUtils.concat(
-                INPUT_ATTRIBUTES,
-                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
-
-    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-                INPUT_ATTRIBUTES,
-                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
-    
-    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-                INPUT_ATTRIBUTES,
-                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS);
-
-    //values for input-type attribute
-    public static final String INPUT_TYPE_SUBMIT = "submit";
-    public static final String INPUT_TYPE_IMAGE = "image";
-    public static final String INPUT_TYPE_HIDDEN = "hidden";
-    public static final String INPUT_TYPE_CHECKBOX = "checkbox";
-    public static final String INPUT_TYPE_PASSWORD = "password";
-    public static final String INPUT_TYPE_TEXT = "text";
-    public static final String INPUT_TYPE_RADIO = "radio";
-    public static final String INPUT_TYPE_BUTTON = "button";
-
-    // <button>
-    public static final String[] BUTTON_ATTRIBUTES =
-    {
-        ALIGN_ATTR,
-        ALT_ATTR,
-    };
-    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
-        (String[]) ArrayUtils.concat(
-            BUTTON_ATTRIBUTES,
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
-    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK =
-        (String[]) ArrayUtils.concat(
-            BUTTON_ATTRIBUTES,
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK);
-    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            BUTTON_ATTRIBUTES,
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
-
-    // <iframe>
-    public static final String FRAMEBORDER_ATTR = "frameborder";
-    public static final String SCROLLING_ATTR = "scrolling";
-
-    // <label>
-    public static final String FOR_ATTR = "for";
-    public static final String[] LABEL_ATTRIBUTES =
-    {
-        ACCESSKEY_ATTR,
-        ONBLUR_ATTR,
-        ONFOCUS_ATTR
-        //FOR_ATTR is no pass through !
-    };
-    public static final String[] LABEL_ATTRIBUTES_WITHOUT_EVENTS =
-    {
-        ACCESSKEY_ATTR
-    };
-    public static final String[] LABEL_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            LABEL_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES);
-    public static final String[] LABEL_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-            LABEL_ATTRIBUTES_WITHOUT_EVENTS,
-            UNIVERSAL_ATTRIBUTES);
-
-    // <select>
-    public static final String MULTIPLE_ATTR = "multiple";
-
-    public static final String[] SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = 
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED;
-    public static final String[] SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS = 
-        COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS;
-
-    // <table>
-    public static final String BGCOLOR_ATTR = "bgcolor";
-    public static final String CELLPADDING_ATTR = "cellpadding";
-    public static final String CELLSPACING_ATTR = "cellspacing";
-    public static final String FRAME_ATTR = "frame";
-    public static final String RULES_ATTR = "rules";
-    public static final String SUMMARY_ATTR = "summary";
-    public static final String[] TABLE_ATTRIBUTES = {
-        ALIGN_ATTR,
-        BGCOLOR_ATTR,
-        BORDER_ATTR,
-        CELLPADDING_ATTR,
-        CELLSPACING_ATTR,
-        FRAME_ATTR,
-        RULES_ATTR,
-        SUMMARY_ATTR,
-        WIDTH_ATTR
-    };
-    public static final String[] TABLE_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            TABLE_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES);
-    public static final String[] TABLE_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-            TABLE_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES);
-
-    // <textarea>
-    public static final String COLS_ATTR = "cols";
-    public static final String ROWS_ATTR = "rows";
-    public static final String WRAP_ATTR = "wrap";
-    public static final String[] TEXTAREA_ATTRIBUTES =
-    {
-        COLS_ATTR,
-        READONLY_ATTR,
-        ROWS_ATTR,
-        WRAP_ATTR
-    };
-    public static final String[] TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
-        (String[]) ArrayUtils.concat(
-            TEXTAREA_ATTRIBUTES,
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
-    public static final String[] TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            TEXTAREA_ATTRIBUTES,
-            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
-
-    // <input type=file>
-    public static final String[] INPUT_FILE_UPLOAD_ATTRIBUTES =
-    {
-        ACCEPT_ATTR
-    };
-    public static final String[] INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
-        (String[]) ArrayUtils.concat(
-            INPUT_FILE_UPLOAD_ATTRIBUTES,
-            INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
-    public static final String[] INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
-        (String[]) ArrayUtils.concat(
-            INPUT_FILE_UPLOAD_ATTRIBUTES,
-            INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
-
-    /*
-    String[] MESSAGE_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            new String[] {DIR_ATTR, LANG_ATTR, TITLE_ATTR, STYLE_ATTR, STYLE_CLASS_ATTR},
-            EVENT_HANDLER_ATTRIBUTES);
-            */
-
-    public static final String[] MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS =
-        (String[]) ArrayUtils.concat(
-            new String[] {DIR_ATTR, LANG_ATTR},
-            EVENT_HANDLER_ATTRIBUTES);
-
-
-    // selectOne/Many table
-    public static final String[] SELECT_TABLE_PASSTHROUGH_ATTRIBUTES =
-        new String[] {STYLE_ATTR, STYLE_CLASS_ATTR, BORDER_ATTR};
-
-    public static final String COMPACT_ATTR = "compact";
-    public static final String[] UL_ATTRIBUTES = {
-        COMPACT_ATTR,
-        TYPE_ATTR
-    };
-    public static final String[] UL_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-            UL_ATTRIBUTES,
-            COMMON_PASSTROUGH_ATTRIBUTES);
-    public static final String[] UL_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-            UL_ATTRIBUTES,
-            UNIVERSAL_ATTRIBUTES);
-
-    //body
-    public static final String BODY_ELEM = "body";
-    public static final String BODY_TARGET = BODY_ELEM;
-    
-    public static final String ONLOAD_ATTR = "onload";
-    public static final String ONUNLOAD_ATTR = "onunload";
-    public static final String ALINK_ATTR = "alink";
-    public static final String VLINK_ATTR = "vlink";
-    public static final String LINK_ATTR = "link";
-    public static final String TEXT_ATTR = "text";
-    public static final String BACKGROUND_ATTR = "background";
-
-    public static final String[] BODY_ATTRIBUTES =
-    {
-        ONLOAD_ATTR,
-        ONUNLOAD_ATTR,
-        ALINK_ATTR,
-        VLINK_ATTR,
-        LINK_ATTR,
-        TEXT_ATTR,
-        BACKGROUND_ATTR,
-        BGCOLOR_ATTR
-    };
-    
-    public static final String[] BODY_ATTRIBUTES_WITHOUT_EVENTS =
-    {
-        ALINK_ATTR,
-        VLINK_ATTR,
-        LINK_ATTR,
-        TEXT_ATTR,
-        BACKGROUND_ATTR,
-        BGCOLOR_ATTR
-    };
-
-    public static final String[] BODY_PASSTHROUGH_ATTRIBUTES =
-        (String[]) ArrayUtils.concat(
-                COMMON_PASSTROUGH_ATTRIBUTES,
-                BODY_ATTRIBUTES);
-    public static final String[] BODY_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
-        (String[]) ArrayUtils.concat(
-                UNIVERSAL_ATTRIBUTES,
-                BODY_ATTRIBUTES_WITHOUT_EVENTS);
-    //HTML attributes needed for renderding only
-    public static final String ID_ATTR = "id";
-    public static final String NAME_ATTR = "name";
-    public static final String VALUE_ATTR = "value";
-    public static final String METHOD_ATTR = "method";
-    public static final String ACTION_ATTR = "action";
-    public static final String COLSPAN_ATTR = "colspan";
-    public static final String SCOPE_ATTR = "scope";
-    public static final String LABEL_ATTR = "label";
-    public static final String SELECTED_ATTR = "selected";
-
-    //HTML attributes values
-    public static final String SCOPE_COLGROUP_VALUE = "colgroup";
-    public static final String SCOPE_ROW_VALUE = "row";
-
-    //HTML element constants
-    public static final String SPAN_ELEM = "span";
-    public static final String DIV_ELEM = "div";
-    public static final String INPUT_ELEM = "input";
-    public static final String BUTTON_ELEM = "button";
-    public static final String SELECT_ELEM = "select";
-    public static final String OPTION_ELEM = "option";
-    public static final String OPTGROUP_ELEM = "optgroup";
-    public static final String TEXTAREA_ELEM = "textarea";
-    public static final String FORM_ELEM = "form";
-    public static final String ANCHOR_ELEM = "a";
-    public static final String H1_ELEM = "h1";
-    public static final String H2_ELEM = "h2";
-    public static final String H3_ELEM = "h3";
-    public static final String H4_ELEM = "h4";
-    public static final String H5_ELEM = "h5";
-    public static final String H6_ELEM = "h6";
-    public static final String IFRAME_ELEM = "iframe";
-    public static final String IMG_ELEM = "img";
-    public static final String LABEL_ELEM = "label";
-    public static final String TABLE_ELEM = "table";
-    public static final String CAPTION_ELEM = "caption";
-    public static final String TR_ELEM = "tr";
-    public static final String TH_ELEM = "th";
-    public static final String TD_ELEM = "td";
-    public static final String TBODY_ELEM = "tbody";
-    public static final String TFOOT_ELEM = "tfoot";
-    public static final String THEAD_ELEM = "thead";
-    public static final String STYLE_ELEM = "style";
-    public static final String SCRIPT_ELEM = "script";
-    public static final String SCRIPT_TYPE_ATTR = "type";
-    public static final String SCRIPT_TYPE_TEXT_JAVASCRIPT = "text/javascript";
-    public static final String STYLE_TYPE_TEXT_CSS = "text/css";
-    public static final String SCRIPT_LANGUAGE_ATTR = "language";
-    public static final String SCRIPT_LANGUAGE_JAVASCRIPT = "JavaScript";
-    public static final String SCRIPT_ELEM_DEFER_ATTR = "defer";
-    public static final String LINK_ELEM = "link";
-    public static final String STYLESHEET_VALUE = "stylesheet";
-    public static final String UL_ELEM = "ul";
-    public static final String OL_ELEM = "ol";
-    public static final String LI_ELEM = "li";
-
-
-    //HTML simple element constants
-    public static final String BR_ELEM = "br";
-
-
-    //HTML entities
-    public static final String NBSP_ENTITY = "&#160;";
-
-    public static final String HREF_PATH_SEPARATOR = "/";
-    public static final String HREF_PATH_FROM_PARAM_SEPARATOR = "?";
-    //removed because wrong for XHTML and not used anyway: String HREF_PARAM_SEPARATOR = "&";
-    public static final String HREF_PARAM_NAME_FROM_VALUE_SEPARATOR = "=";
-
-}
+/*
+ * 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.shared.util.renderkit;
+
+import org.apache.myfaces.shared.util.ArrayUtils;
+
+
+/**
+ * Constant declarations for HTML rendering.
+ * @author Manfred Geiler
+ * @author Anton Koinov
+ * @version $Revision: 938289 $ $Date: 2010-04-26 20:35:24 -0500 (Lun, 26 Abr 2010) $
+ */
+public final class HTML
+{
+
+    // Common attributes
+    public static final String ALIGN_ATTR = "align";
+    public static final String BORDER_ATTR = "border";
+    public static final String WIDTH_ATTR = "width";
+    public static final String READONLY_ATTR = "readonly";
+    public static final String FILE_ATTR = "file";
+    public static final String ACCEPT_ATTR = "accept";
+
+    // Common event handler attributes
+    public static final String ONCLICK_ATTR     = "onclick";
+    public static final String ONDBLCLICK_ATTR  = "ondblclick";
+    public static final String ONMOUSEDOWN_ATTR = "onmousedown";
+    public static final String ONMOUSEUP_ATTR   = "onmouseup";
+    public static final String ONMOUSEOVER_ATTR = "onmouseover";
+    public static final String ONMOUSEMOVE_ATTR = "onmousemove";
+    public static final String ONMOUSEOUT_ATTR  = "onmouseout";
+    public static final String ONKEYPRESS_ATTR  = "onkeypress";
+    public static final String ONKEYDOWN_ATTR   = "onkeydown";
+    public static final String ONKEYUP_ATTR     = "onkeyup";
+    public static final String ONFOCUS_ATTR = "onfocus";
+    public static final String ONBLUR_ATTR = "onblur";
+    public static final String[] EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK =
+    {
+        ONDBLCLICK_ATTR,
+        ONMOUSEDOWN_ATTR,
+        ONMOUSEUP_ATTR,
+        ONMOUSEOVER_ATTR,
+        ONMOUSEMOVE_ATTR,
+        ONMOUSEOUT_ATTR,
+        ONKEYPRESS_ATTR,
+        ONKEYDOWN_ATTR,
+        ONKEYUP_ATTR
+    };
+    public static final String[] EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
+    {
+        ONDBLCLICK_ATTR,
+        ONMOUSEDOWN_ATTR,
+        ONMOUSEUP_ATTR,
+        ONMOUSEMOVE_ATTR,
+        ONKEYPRESS_ATTR,
+        ONKEYDOWN_ATTR,
+        ONKEYUP_ATTR,
+        ONCLICK_ATTR
+    };
+    public static final String[] EVENT_HANDLER_ATTRIBUTES =
+            (String[]) ArrayUtils.concat(
+                EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
+                new String[] {ONCLICK_ATTR});
+
+    // Input field event handler attributes
+    public static final String ONSELECT_ATTR = "onselect";
+    public static final String ONCHANGE_ATTR = "onchange";
+    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES =
+    {
+        ONFOCUS_ATTR,
+        ONBLUR_ATTR,
+        ONSELECT_ATTR,
+        ONCHANGE_ATTR
+    };
+
+    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS =
+    {
+        ONBLUR_ATTR,
+        ONSELECT_ATTR,
+        ONCHANGE_ATTR
+    };
+    
+    public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE =
+    {
+        ONFOCUS_ATTR,
+        ONBLUR_ATTR
+    };
+
+    // universal attributes
+    public static final String DIR_ATTR   = "dir";
+    public static final String LANG_ATTR  = "lang";
+    public static final String STYLE_ATTR = "style";
+    public static final String TITLE_ATTR = "title";
+    public static final String STYLE_CLASS_ATTR = "styleClass"; //"class" cannot be used as property name
+     
+    public static final String[] UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE =
+    {
+        DIR_ATTR,
+        LANG_ATTR,
+        TITLE_ATTR,
+
+        //NOTE: if changed, please verify universal attributes in HtmlMessageRenderer !
+    };
+    public static final String[] UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE_AND_TITLE =
+    {
+        DIR_ATTR,
+        LANG_ATTR,
+    };
+    public static final String[] UNIVERSAL_ATTRIBUTES =
+            (String[]) ArrayUtils.concat(
+                UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE,
+                new String[] {STYLE_ATTR, STYLE_CLASS_ATTR});
+
+    //universal, but not the same property-name -
+    //styleClass attribute is rendered as such
+    public static final String CLASS_ATTR = "class";
+
+    // common form field attributes
+    public static final String ACCESSKEY_ATTR   = "accesskey";
+    public static final String TABINDEX_ATTR    = "tabindex";
+    public static final String DISABLED_ATTR = "disabled";
+    public static final String[] COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED =
+    {
+        ACCESSKEY_ATTR,
+        TABINDEX_ATTR
+    };
+    public static final String[] COMMON_FIELD_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            new String[] {DISABLED_ATTR});
+
+    // Common Attributes
+    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            EVENT_HANDLER_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES);
+    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE =
+        (String[]) ArrayUtils.concat(
+            EVENT_HANDLER_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
+    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK =
+        (String[]) ArrayUtils.concat(
+            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
+            UNIVERSAL_ATTRIBUTES);
+    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
+        (String[]) ArrayUtils.concat(
+            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
+            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED =
+        (String[]) ArrayUtils.concat(
+            COMMON_PASSTROUGH_ATTRIBUTES,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            COMMON_FIELD_EVENT_ATTRIBUTES);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
+        (String[]) ArrayUtils.concat(
+            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            COMMON_FIELD_EVENT_ATTRIBUTES);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS =
+        (String[]) ArrayUtils.concat(
+            COMMON_PASSTROUGH_ATTRIBUTES,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK =
+        (String[]) ArrayUtils.concat(
+            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK =
+        (String[]) ArrayUtils.concat(
+            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+            COMMON_FIELD_EVENT_ATTRIBUTES);
+    public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
+        (String[]) ArrayUtils.concat(
+            EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT,
+            UNIVERSAL_ATTRIBUTES);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            UNIVERSAL_ATTRIBUTES,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED);
+    public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE,
+            COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED);
+    
+    // <a>
+    public static final String TARGET_ATTR = "target";  //used by <a> and <form>
+    public static final String CHARSET_ATTR     = "charset";
+    public static final String COORDS_ATTR      = "coords";
+    public static final String HREF_ATTR    = "href";
+    public static final String HREFLANG_ATTR    = "hreflang";
+    public static final String REL_ATTR         = "rel";
+    public static final String REV_ATTR         = "rev";
+    public static final String SHAPE_ATTR       = "shape";
+    public static final String TYPE_ATTR        = "type";
+    public static final String[] ANCHOR_ATTRIBUTES =
+    {
+        ACCESSKEY_ATTR,
+        CHARSET_ATTR,
+        COORDS_ATTR,
+        HREFLANG_ATTR,
+        REL_ATTR,
+        REV_ATTR,
+        SHAPE_ATTR,
+        TABINDEX_ATTR,
+        TARGET_ATTR,
+        TYPE_ATTR
+    };
+    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            ANCHOR_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES,
+            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
+    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE =
+        (String[]) ArrayUtils.concat(
+            ANCHOR_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
+            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
+    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
+        (String[]) ArrayUtils.concat(
+            ANCHOR_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE,
+            COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONSELECT_AND_ONCHANGE);
+    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+            ANCHOR_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES);
+    public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            ANCHOR_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
+
+    // <form>
+    public static final String ACCEPT_CHARSET_ATTR = "accept-charset";
+    public static final String ENCTYPE_ATTR = "enctype";
+    public static final String ONRESET_ATTR = "onreset";
+    public static final String ONSUMBIT_ATTR = "onsubmit";
+    public static final String[] FORM_ATTRIBUTES =
+    {
+        ACCEPT_ATTR,
+        ACCEPT_CHARSET_ATTR,
+        ENCTYPE_ATTR,
+        ONRESET_ATTR,
+        ONSUMBIT_ATTR,
+        TARGET_ATTR,
+    };
+    public static final String[] FORM_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            FORM_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES);
+    public static final String[] FORM_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+            FORM_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES);
+    // <img>
+    public static final String SRC_ATTR = "src";
+    public static final String ALT_ATTR = "alt";
+    public static final String HEIGHT_ATTR = "height";
+    public static final String HSPACE_ATTR = "hspace";
+    public static final String ISMAP_ATTR = "ismap";
+    public static final String LONGDESC_ATTR = "longdesc";
+    public static final String USEMAP_ATTR = "usemap";
+    public static final String VSPACE_ATTR = "vspace";
+
+    public static final String[] IMG_ATTRIBUTES =
+    {
+        ALIGN_ATTR,
+        ALT_ATTR,
+        BORDER_ATTR,
+        HEIGHT_ATTR,
+        HSPACE_ATTR,
+        ISMAP_ATTR,
+        LONGDESC_ATTR,
+        USEMAP_ATTR,
+        VSPACE_ATTR,
+        WIDTH_ATTR
+    };
+    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+           IMG_ATTRIBUTES,
+           COMMON_PASSTROUGH_ATTRIBUTES);
+    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT =
+        (String[]) ArrayUtils.concat(
+           IMG_ATTRIBUTES,
+           COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONMOUSEOVER_AND_ONMOUSEOUT);
+    public static final String[] IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+           IMG_ATTRIBUTES,
+           UNIVERSAL_ATTRIBUTES);
+    // <input>
+    public static final String SIZE_ATTR = "size";
+    public static final String AUTOCOMPLETE_ATTR = "autocomplete";
+    public static final String CHECKED_ATTR = "checked";
+    public static final String MAXLENGTH_ATTR = "maxlength";
+
+    public static final String[] INPUT_ATTRIBUTES = {
+        ALIGN_ATTR,
+        ALT_ATTR,
+        CHECKED_ATTR,
+        MAXLENGTH_ATTR,
+        READONLY_ATTR,
+        SIZE_ATTR
+    };
+    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
+        (String[]) ArrayUtils.concat(
+                INPUT_ATTRIBUTES,
+                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
+        (String[]) ArrayUtils.concat(
+                INPUT_ATTRIBUTES,
+                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
+
+    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK =
+        (String[]) ArrayUtils.concat(
+                INPUT_ATTRIBUTES,
+                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
+
+    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+                INPUT_ATTRIBUTES,
+                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+    
+    public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+                INPUT_ATTRIBUTES,
+                COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS);
+
+    //values for input-type attribute
+    public static final String INPUT_TYPE_SUBMIT = "submit";
+    public static final String INPUT_TYPE_IMAGE = "image";
+    public static final String INPUT_TYPE_HIDDEN = "hidden";
+    public static final String INPUT_TYPE_CHECKBOX = "checkbox";
+    public static final String INPUT_TYPE_PASSWORD = "password";
+    public static final String INPUT_TYPE_TEXT = "text";
+    public static final String INPUT_TYPE_RADIO = "radio";
+    public static final String INPUT_TYPE_BUTTON = "button";
+
+    // <button>
+    public static final String[] BUTTON_ATTRIBUTES =
+    {
+        ALIGN_ATTR,
+        ALT_ATTR,
+    };
+    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
+        (String[]) ArrayUtils.concat(
+            BUTTON_ATTRIBUTES,
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK =
+        (String[]) ArrayUtils.concat(
+            BUTTON_ATTRIBUTES,
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK);
+    public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            BUTTON_ATTRIBUTES,
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+
+    // <iframe>
+    public static final String FRAMEBORDER_ATTR = "frameborder";
+    public static final String SCROLLING_ATTR = "scrolling";
+
+    // <label>
+    public static final String FOR_ATTR = "for";
+    public static final String[] LABEL_ATTRIBUTES =
+    {
+        ACCESSKEY_ATTR,
+        ONBLUR_ATTR,
+        ONFOCUS_ATTR
+        //FOR_ATTR is no pass through !
+    };
+    public static final String[] LABEL_ATTRIBUTES_WITHOUT_EVENTS =
+    {
+        ACCESSKEY_ATTR
+    };
+    public static final String[] LABEL_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            LABEL_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES);
+    public static final String[] LABEL_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+            LABEL_ATTRIBUTES_WITHOUT_EVENTS,
+            UNIVERSAL_ATTRIBUTES);
+
+    // <select>
+    public static final String MULTIPLE_ATTR = "multiple";
+
+    public static final String[] SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = 
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED;
+    public static final String[] SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS = 
+        COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS;
+
+    // <table>
+    public static final String BGCOLOR_ATTR = "bgcolor";
+    public static final String CELLPADDING_ATTR = "cellpadding";
+    public static final String CELLSPACING_ATTR = "cellspacing";
+    public static final String FRAME_ATTR = "frame";
+    public static final String RULES_ATTR = "rules";
+    public static final String SUMMARY_ATTR = "summary";
+    public static final String[] TABLE_ATTRIBUTES = {
+        ALIGN_ATTR,
+        BGCOLOR_ATTR,
+        BORDER_ATTR,
+        CELLPADDING_ATTR,
+        CELLSPACING_ATTR,
+        FRAME_ATTR,
+        RULES_ATTR,
+        SUMMARY_ATTR,
+        WIDTH_ATTR
+    };
+    public static final String[] TABLE_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            TABLE_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES);
+    public static final String[] TABLE_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+            TABLE_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES);
+
+    // <textarea>
+    public static final String COLS_ATTR = "cols";
+    public static final String ROWS_ATTR = "rows";
+    public static final String WRAP_ATTR = "wrap";
+    public static final String[] TEXTAREA_ATTRIBUTES =
+    {
+        COLS_ATTR,
+        READONLY_ATTR,
+        ROWS_ATTR,
+        WRAP_ATTR
+    };
+    public static final String[] TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
+        (String[]) ArrayUtils.concat(
+            TEXTAREA_ATTRIBUTES,
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+    public static final String[] TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            TEXTAREA_ATTRIBUTES,
+            COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+
+    // <input type=file>
+    public static final String[] INPUT_FILE_UPLOAD_ATTRIBUTES =
+    {
+        ACCEPT_ATTR
+    };
+    public static final String[] INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED =
+        (String[]) ArrayUtils.concat(
+            INPUT_FILE_UPLOAD_ATTRIBUTES,
+            INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+    public static final String[] INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS =
+        (String[]) ArrayUtils.concat(
+            INPUT_FILE_UPLOAD_ATTRIBUTES,
+            INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+
+    /*
+    String[] MESSAGE_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            new String[] {DIR_ATTR, LANG_ATTR, TITLE_ATTR, STYLE_ATTR, STYLE_CLASS_ATTR},
+            EVENT_HANDLER_ATTRIBUTES);
+            */
+
+    public static final String[] MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS =
+        (String[]) ArrayUtils.concat(
+            new String[] {DIR_ATTR, LANG_ATTR},
+            EVENT_HANDLER_ATTRIBUTES);
+
+
+    // selectOne/Many table
+    public static final String[] SELECT_TABLE_PASSTHROUGH_ATTRIBUTES =
+        new String[] {STYLE_ATTR, STYLE_CLASS_ATTR, BORDER_ATTR};
+
+    public static final String COMPACT_ATTR = "compact";
+    public static final String[] UL_ATTRIBUTES = {
+        COMPACT_ATTR,
+        TYPE_ATTR
+    };
+    public static final String[] UL_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+            UL_ATTRIBUTES,
+            COMMON_PASSTROUGH_ATTRIBUTES);
+    public static final String[] UL_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+            UL_ATTRIBUTES,
+            UNIVERSAL_ATTRIBUTES);
+
+    //body
+    public static final String BODY_ELEM = "body";
+    public static final String BODY_TARGET = BODY_ELEM;
+    
+    public static final String ONLOAD_ATTR = "onload";
+    public static final String ONUNLOAD_ATTR = "onunload";
+    public static final String ALINK_ATTR = "alink";
+    public static final String VLINK_ATTR = "vlink";
+    public static final String LINK_ATTR = "link";
+    public static final String TEXT_ATTR = "text";
+    public static final String BACKGROUND_ATTR = "background";
+
+    public static final String[] BODY_ATTRIBUTES =
+    {
+        ONLOAD_ATTR,
+        ONUNLOAD_ATTR,
+        ALINK_ATTR,
+        VLINK_ATTR,
+        LINK_ATTR,
+        TEXT_ATTR,
+        BACKGROUND_ATTR,
+        BGCOLOR_ATTR
+    };
+    
+    public static final String[] BODY_ATTRIBUTES_WITHOUT_EVENTS =
+    {
+        ALINK_ATTR,
+        VLINK_ATTR,
+        LINK_ATTR,
+        TEXT_ATTR,
+        BACKGROUND_ATTR,
+        BGCOLOR_ATTR
+    };
+
+    public static final String[] BODY_PASSTHROUGH_ATTRIBUTES =
+        (String[]) ArrayUtils.concat(
+                COMMON_PASSTROUGH_ATTRIBUTES,
+                BODY_ATTRIBUTES);
+    public static final String[] BODY_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS =
+        (String[]) ArrayUtils.concat(
+                UNIVERSAL_ATTRIBUTES,
+                BODY_ATTRIBUTES_WITHOUT_EVENTS);
+    //HTML attributes needed for renderding only
+    public static final String ID_ATTR = "id";
+    public static final String NAME_ATTR = "name";
+    public static final String VALUE_ATTR = "value";
+    public static final String METHOD_ATTR = "method";
+    public static final String ACTION_ATTR = "action";
+    public static final String COLSPAN_ATTR = "colspan";
+    public static final String SCOPE_ATTR = "scope";
+    public static final String LABEL_ATTR = "label";
+    public static final String SELECTED_ATTR = "selected";
+
+    //HTML attributes values
+    public static final String SCOPE_COLGROUP_VALUE = "colgroup";
+    public static final String SCOPE_ROW_VALUE = "row";
+
+    //HTML element constants
+    public static final String SPAN_ELEM = "span";
+    public static final String DIV_ELEM = "div";
+    public static final String INPUT_ELEM = "input";
+    public static final String BUTTON_ELEM = "button";
+    public static final String SELECT_ELEM = "select";
+    public static final String OPTION_ELEM = "option";
+    public static final String OPTGROUP_ELEM = "optgroup";
+    public static final String TEXTAREA_ELEM = "textarea";
+    public static final String FORM_ELEM = "form";
+    public static final String ANCHOR_ELEM = "a";
+    public static final String H1_ELEM = "h1";
+    public static final String H2_ELEM = "h2";
+    public static final String H3_ELEM = "h3";
+    public static final String H4_ELEM = "h4";
+    public static final String H5_ELEM = "h5";
+    public static final String H6_ELEM = "h6";
+    public static final String IFRAME_ELEM = "iframe";
+    public static final String IMG_ELEM = "img";
+    public static final String LABEL_ELEM = "label";
+    public static final String TABLE_ELEM = "table";
+    public static final String CAPTION_ELEM = "caption";
+    public static final String TR_ELEM = "tr";
+    public static final String TH_ELEM = "th";
+    public static final String TD_ELEM = "td";
+    public static final String TBODY_ELEM = "tbody";
+    public static final String TFOOT_ELEM = "tfoot";
+    public static final String THEAD_ELEM = "thead";
+    public static final String STYLE_ELEM = "style";
+    public static final String SCRIPT_ELEM = "script";
+    public static final String SCRIPT_TYPE_ATTR = "type";
+    public static final String SCRIPT_TYPE_TEXT_JAVASCRIPT = "text/javascript";
+    public static final String STYLE_TYPE_TEXT_CSS = "text/css";
+    public static final String SCRIPT_LANGUAGE_ATTR = "language";
+    public static final String SCRIPT_LANGUAGE_JAVASCRIPT = "JavaScript";
+    public static final String SCRIPT_ELEM_DEFER_ATTR = "defer";
+    public static final String LINK_ELEM = "link";
+    public static final String STYLESHEET_VALUE = "stylesheet";
+    public static final String UL_ELEM = "ul";
+    public static final String OL_ELEM = "ol";
+    public static final String LI_ELEM = "li";
+
+
+    //HTML simple element constants
+    public static final String BR_ELEM = "br";
+
+
+    //HTML entities
+    public static final String NBSP_ENTITY = "&#160;";
+
+    public static final String HREF_PATH_SEPARATOR = "/";
+    public static final String HREF_PATH_FROM_PARAM_SEPARATOR = "?";
+    //removed because wrong for XHTML and not used anyway: String HREF_PARAM_SEPARATOR = "&";
+    public static final String HREF_PARAM_NAME_FROM_VALUE_SEPARATOR = "=";
+
+}

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/JsfProperties.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/JsfProperties.java?rev=1535874&r1=1535873&r2=1535874&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/JsfProperties.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/renderkit/JsfProperties.java Fri Oct 25 21:24:09 2013
@@ -1,169 +1,169 @@
-/*
- * 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.shared.util.renderkit;
-
-
-/**
- * Constant declarations for JSF tags
- * @author Anton Koinov (latest modification by $Author: jakobk $)
- * @version $Revision: 939498 $ $Date: 2010-04-29 17:27:30 -0500 (Jue, 29 Abr 2010) $
- */
-public final class JsfProperties
-{
-    //~ Static fields/initializers -----------------------------------------------------------------
-
-    // Common Attributes
-    public static final String   ID_PROP                        = "id";
-    public static final String   VALUE_PROP                     = "value";
-    public static final String   BINDING_PROP                   = "binding";
-    public static final String   STYLE_PROP                     = "style";
-    public static final String   STYLE_CLASS_PROP               = "styleClass";
-    public static final String   ESCAPE_PROP                    = "escape";
-    public static final String   FORCE_ID_PROP                  = "forceId";
-    public static final String   FORCE_ID_INDEX_PROP            = "forceIdIndex";
-    public static final String   RENDERED_PROP                  = "rendered";
-
-    // Common Output Attributes
-    public static final String   FOR_PROP                       = "for";
-    public static final String   CONVERTER_PROP                 = "converter";
-
-    // Ouput_Time Attributes
-    public static final String   TIME_STYLE_PROP                = "timeStyle";
-    public static final String   TIMEZONE_PROP                  = "timezone";
-
-    // Common Input Attributes
-    public static final String   REQUIRED_PROP                  = "required";
-    public static final String   VALIDATOR_PROP                 = "validator";
-    public static final String   DISABLED_PROP                  = "disabled";
-    public static final String   READONLY_PROP                  = "readonly";
-
-    // Input_Secret Attributes
-    public static final String   REDISPLAY_PROP                 = "redisplay";
-
-    // Input_Checkbox Attributes
-    public static final String   LAYOUT_PROP                    = "layout";
-
-    // Select_Menu Attributes
-    public static final String   SIZE_PROP                     = "size";
-
-    // SelectMany Checkbox List/ Select One Radio Attributes
-    public static final String BORDER_PROP                   = "border";
-    public static final String DISABLED_CLASS_PROP           = "disabledClass";
-    public static final String ENABLED_CLASS_PROP            = "enabledClass";
-    public static final String SELECTED_CLASS_PROP           = "selectedClass";
-    public static final String UNSELECTED_CLASS_PROP         = "unselectedClass";
-    public static final String HIDE_NO_SELECTION_OPTION_PROP = "hideNoSelectionOption";
-
-    // Common Command Attributes
-    /**@deprecated */
-    public static final String   COMMAND_CLASS_PROP           = "commandClass";
-    public static final String   LABEL_PROP                   = "label";
-    public static final String   IMAGE_PROP                   = "image";
-    public static final String   ACTION_PROP                 = "action";
-    public static final String   IMMEDIATE_PROP              = "immediate";
-
-
-    // Command_Button Attributes
-    public static final String   TYPE_PROP                    = "type";
-
-    // Common Panel Attributes
-    /**@deprecated */
-    public static final String   PANEL_CLASS_PROP       = "panelClass";
-    public static final String   FOOTER_CLASS_PROP      = "footerClass";
-    public static final String   HEADER_CLASS_PROP      = "headerClass";
-    public static final String   COLUMN_CLASSES_PROP    = "columnClasses";
-    public static final String   ROW_CLASSES_PROP       = "rowClasses";
-    public static final String   BODYROWS_PROP          = "bodyrows";
-
-    // Panel_Grid Attributes
-    public static final String   COLUMNS_PROP          = "columns";
-    public static final String   COLSPAN_PROP          = "colspan"; // extension
-    public static final String   CAPTION_CLASS_PROP    = "captionClass";
-    public static final String   CAPTION_STYLE_PROP    = "captionStyle";
-
-    // UIMessage and UIMessages attributes
-    public static final String SHOW_SUMMARY_PROP            = "showSummary";
-    public static final String SHOW_DETAIL_PROP             = "showDetail";
-    public static final String GLOBAL_ONLY_PROP             = "globalOnly";
-
-    // HtmlOutputMessage attributes
-    public static final String ERROR_CLASS_PROP            = "errorClass";
-    public static final String ERROR_STYLE_PROP            = "errorStyle";
-    public static final String FATAL_CLASS_PROP            = "fatalClass";
-    public static final String FATAL_STYLE_PROP            = "fatalStyle";
-    public static final String INFO_CLASS_PROP             = "infoClass";
-    public static final String INFO_STYLE_PROP             = "infoStyle";
-    public static final String WARN_CLASS_PROP             = "warnClass";
-    public static final String WARN_STYLE_PROP             = "warnStyle";
-    public static final String TITLE_PROP                  = "title";
-    public static final String TOOLTIP_PROP                = "tooltip";
-    
-    // HtmlOutputLink Attributes
-    public static final String FRAGMENT_PROP               = "fragment";
-
-    // GraphicImage attributes
-    public static final String NAME_PROP                   = "name";
-    public static final String URL_PROP                    = "url";
-    public static final String LIBRARY_PROP                = "library";
-    
-    // HtmlOutputScript (missing) attributes
-    public static final String TARGET_PROP                 = "target";
-    
-    // UISelectItem attributes
-    public static final String ITEM_DISABLED_PROP          = "itemDisabled";
-    public static final String ITEM_DESCRIPTION_PROP       = "itemDescription";
-    public static final String ITEM_LABEL_PROP             = "itemLabel";
-    public static final String ITEM_VALUE_PROP             = "itemValue";
-    public static final String ITEM_ESCAPED_PROP           = "itemEscaped";
-    public static final String NO_SELECTION_OPTION_PROP    = "noSelectionOption";
-    
-    // UISelectItems attributes
-    public static final String ITEM_LABEL_ESCAPED_PROP     = "itemLabelEscaped";
-    public static final String NO_SELECTION_VALUE_PROP     = "noSelectionValue";
-
-    // UIData attributes
-    public static final String ROWS_PROP                   = "rows";
-    public static final String VAR_PROP                    = "var";
-    public static final String FIRST_PROP                  = "first";
-
-    // dataTable (extended) attributes
-    public static final String ROW_ID_PROP                 = "rowId";
-    public static final String ROW_STYLECLASS_PROP         = "rowStyleClass";
-    public static final String ROW_STYLE_PROP              = "rowStyle";
-    
-    // HtmlColumn attributes
-    public static final String ROW_HEADER_PROP             = "rowHeader";
-
-    // Alternate locations (instead of using AddResource)
-    public static final String JAVASCRIPT_LOCATION_PROP    = "javascriptLocation";
-    public static final String IMAGE_LOCATION_PROP         = "imageLocation";
-    public static final String STYLE_LOCATION_PROP         = "styleLocation";
-
-    public static final String ACCEPTCHARSET_PROP          = "acceptcharset";
-    
-    //~ Myfaces Extensions -------------------------------------------------------------------------------
-
-    // UISortData attributes
-    public static final String COLUMN_PROP                 = "column";
-    public static final String ASCENDING_PROP              = "ascending";
-    
-    // HtmlSelectManyCheckbox attributes
-    public static final String LAYOUT_WIDTH_PROP           = "layoutWidth";
-
-}
+/*
+ * 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.shared.util.renderkit;
+
+
+/**
+ * Constant declarations for JSF tags
+ * @author Anton Koinov (latest modification by $Author: jakobk $)
+ * @version $Revision: 939498 $ $Date: 2010-04-29 17:27:30 -0500 (Jue, 29 Abr 2010) $
+ */
+public final class JsfProperties
+{
+    //~ Static fields/initializers -----------------------------------------------------------------
+
+    // Common Attributes
+    public static final String   ID_PROP                        = "id";
+    public static final String   VALUE_PROP                     = "value";
+    public static final String   BINDING_PROP                   = "binding";
+    public static final String   STYLE_PROP                     = "style";
+    public static final String   STYLE_CLASS_PROP               = "styleClass";
+    public static final String   ESCAPE_PROP                    = "escape";
+    public static final String   FORCE_ID_PROP                  = "forceId";
+    public static final String   FORCE_ID_INDEX_PROP            = "forceIdIndex";
+    public static final String   RENDERED_PROP                  = "rendered";
+
+    // Common Output Attributes
+    public static final String   FOR_PROP                       = "for";
+    public static final String   CONVERTER_PROP                 = "converter";
+
+    // Ouput_Time Attributes
+    public static final String   TIME_STYLE_PROP                = "timeStyle";
+    public static final String   TIMEZONE_PROP                  = "timezone";
+
+    // Common Input Attributes
+    public static final String   REQUIRED_PROP                  = "required";
+    public static final String   VALIDATOR_PROP                 = "validator";
+    public static final String   DISABLED_PROP                  = "disabled";
+    public static final String   READONLY_PROP                  = "readonly";
+
+    // Input_Secret Attributes
+    public static final String   REDISPLAY_PROP                 = "redisplay";
+
+    // Input_Checkbox Attributes
+    public static final String   LAYOUT_PROP                    = "layout";
+
+    // Select_Menu Attributes
+    public static final String   SIZE_PROP                     = "size";
+
+    // SelectMany Checkbox List/ Select One Radio Attributes
+    public static final String BORDER_PROP                   = "border";
+    public static final String DISABLED_CLASS_PROP           = "disabledClass";
+    public static final String ENABLED_CLASS_PROP            = "enabledClass";
+    public static final String SELECTED_CLASS_PROP           = "selectedClass";
+    public static final String UNSELECTED_CLASS_PROP         = "unselectedClass";
+    public static final String HIDE_NO_SELECTION_OPTION_PROP = "hideNoSelectionOption";
+
+    // Common Command Attributes
+    /**@deprecated */
+    public static final String   COMMAND_CLASS_PROP           = "commandClass";
+    public static final String   LABEL_PROP                   = "label";
+    public static final String   IMAGE_PROP                   = "image";
+    public static final String   ACTION_PROP                 = "action";
+    public static final String   IMMEDIATE_PROP              = "immediate";
+
+
+    // Command_Button Attributes
+    public static final String   TYPE_PROP                    = "type";
+
+    // Common Panel Attributes
+    /**@deprecated */
+    public static final String   PANEL_CLASS_PROP       = "panelClass";
+    public static final String   FOOTER_CLASS_PROP      = "footerClass";
+    public static final String   HEADER_CLASS_PROP      = "headerClass";
+    public static final String   COLUMN_CLASSES_PROP    = "columnClasses";
+    public static final String   ROW_CLASSES_PROP       = "rowClasses";
+    public static final String   BODYROWS_PROP          = "bodyrows";
+
+    // Panel_Grid Attributes
+    public static final String   COLUMNS_PROP          = "columns";
+    public static final String   COLSPAN_PROP          = "colspan"; // extension
+    public static final String   CAPTION_CLASS_PROP    = "captionClass";
+    public static final String   CAPTION_STYLE_PROP    = "captionStyle";
+
+    // UIMessage and UIMessages attributes
+    public static final String SHOW_SUMMARY_PROP            = "showSummary";
+    public static final String SHOW_DETAIL_PROP             = "showDetail";
+    public static final String GLOBAL_ONLY_PROP             = "globalOnly";
+
+    // HtmlOutputMessage attributes
+    public static final String ERROR_CLASS_PROP            = "errorClass";
+    public static final String ERROR_STYLE_PROP            = "errorStyle";
+    public static final String FATAL_CLASS_PROP            = "fatalClass";
+    public static final String FATAL_STYLE_PROP            = "fatalStyle";
+    public static final String INFO_CLASS_PROP             = "infoClass";
+    public static final String INFO_STYLE_PROP             = "infoStyle";
+    public static final String WARN_CLASS_PROP             = "warnClass";
+    public static final String WARN_STYLE_PROP             = "warnStyle";
+    public static final String TITLE_PROP                  = "title";
+    public static final String TOOLTIP_PROP                = "tooltip";
+    
+    // HtmlOutputLink Attributes
+    public static final String FRAGMENT_PROP               = "fragment";
+
+    // GraphicImage attributes
+    public static final String NAME_PROP                   = "name";
+    public static final String URL_PROP                    = "url";
+    public static final String LIBRARY_PROP                = "library";
+    
+    // HtmlOutputScript (missing) attributes
+    public static final String TARGET_PROP                 = "target";
+    
+    // UISelectItem attributes
+    public static final String ITEM_DISABLED_PROP          = "itemDisabled";
+    public static final String ITEM_DESCRIPTION_PROP       = "itemDescription";
+    public static final String ITEM_LABEL_PROP             = "itemLabel";
+    public static final String ITEM_VALUE_PROP             = "itemValue";
+    public static final String ITEM_ESCAPED_PROP           = "itemEscaped";
+    public static final String NO_SELECTION_OPTION_PROP    = "noSelectionOption";
+    
+    // UISelectItems attributes
+    public static final String ITEM_LABEL_ESCAPED_PROP     = "itemLabelEscaped";
+    public static final String NO_SELECTION_VALUE_PROP     = "noSelectionValue";
+
+    // UIData attributes
+    public static final String ROWS_PROP                   = "rows";
+    public static final String VAR_PROP                    = "var";
+    public static final String FIRST_PROP                  = "first";
+
+    // dataTable (extended) attributes
+    public static final String ROW_ID_PROP                 = "rowId";
+    public static final String ROW_STYLECLASS_PROP         = "rowStyleClass";
+    public static final String ROW_STYLE_PROP              = "rowStyle";
+    
+    // HtmlColumn attributes
+    public static final String ROW_HEADER_PROP             = "rowHeader";
+
+    // Alternate locations (instead of using AddResource)
+    public static final String JAVASCRIPT_LOCATION_PROP    = "javascriptLocation";
+    public static final String IMAGE_LOCATION_PROP         = "imageLocation";
+    public static final String STYLE_LOCATION_PROP         = "styleLocation";
+
+    public static final String ACCEPTCHARSET_PROP          = "acceptcharset";
+    
+    //~ Myfaces Extensions -------------------------------------------------------------------------------
+
+    // UISortData attributes
+    public static final String COLUMN_PROP                 = "column";
+    public static final String ASCENDING_PROP              = "ascending";
+    
+    // HtmlSelectManyCheckbox attributes
+    public static final String LAYOUT_WIDTH_PROP           = "layoutWidth";
+
+}

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java?rev=1535874&r1=1535873&r2=1535874&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java Fri Oct 25 21:24:09 2013
@@ -53,7 +53,8 @@ public abstract class ViewDeclarationLan
             Application application = context.getApplication();
 
             // Create a new UIViewRoot object instance using Application.createComponent(UIViewRoot.COMPONENT_TYPE).
-            UIViewRoot newViewRoot = (UIViewRoot) application.createComponent(UIViewRoot.COMPONENT_TYPE);
+            UIViewRoot newViewRoot = (UIViewRoot) application.createComponent(
+                context, UIViewRoot.COMPONENT_TYPE, null);
             UIViewRoot oldViewRoot = context.getViewRoot();
             if (oldViewRoot == null)
             {