Author: ppitonak(a)redhat.com Date: 2010-12-16 08:02:05 -0500 (Thu, 16 Dec 2010) New Revision: 20608 Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java Log: * mechanism for getting attributes of UI components and behaviors refactored Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; /** - * Representation of all attributes of a JSF component. + * Representation of all attributes of a JSF component or behavior. * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ @@ -95,7 +95,7 @@ } if (!loadFromClass && richfacesAttributes.containsKey(componentClass)) { - logger.debug("retrieving attributes of " + componentClass.getName() + " from faces-config.xml"); + logger.info("retrieving attributes of " + componentClass.getName() + " from faces-config.xml"); if (attributes == null) { attributes = new TreeMap<String, Attribute>(); } @@ -104,7 +104,7 @@ attributes.put(newAttr.getName(), newAttr); } } else { - logger.debug("retrieving attributes of " + componentClass.getName() + " from class descriptor"); + logger.info("retrieving attributes of " + componentClass.getName() + " from class descriptor"); loadAttributesFromClass(componentClass); } @@ -115,42 +115,68 @@ } /** - * Factory method for creating instances of class Attributes. + * Constructor for empty class Attributes. * * @param componentClass * class object of a JSF component whose attributes will be stored * @param beanClass + * class object of a managed bean + */ + private Attributes(Class<?> componentClass, Class<?> beanClass) { + logger.debug("creating attributes map for " + componentClass); + this.beanClass = beanClass; + attributes = new TreeMap<String, Attribute>(); + } + + /** + * Factory method for creating instances of class Attributes. Attributes are loaded from faces-config.xml. + * + * @param clazz + * class object of a JSF component whose attributes will be stored + * @param beanClass * class object of a managed bean */ - public static Attributes getUIComponentAttributes(Class<? extends UIComponent> componentClass, Class<?> beanClass) { - return new Attributes(componentClass, beanClass, true); + public static Attributes getComponentAttributesFromFacesConfig(Class<? extends UIComponent> clazz, Class<?> beanClass) { + return new Attributes(clazz, beanClass, false); } /** - * Factory method for creating instances of class Attributes. + * Factory method for creating instances of class Attributes. Attributes are loaded from class. * - * @param componentClass - * class object of a RichFaces component whose attributes will be stored + * @param clazz + * class object of a JSF component whose attributes will be stored * @param beanClass * class object of a managed bean */ - public static Attributes getUIComponentAttributes(Class<? extends UIComponent> componentClass, Class<?> beanClass, boolean loadFromClass) { - return new Attributes(componentClass, beanClass, loadFromClass); + public static Attributes getComponentAttributesFromClass(Class<? extends UIComponent> clazz, Class<?> beanClass) { + return new Attributes(clazz, beanClass, true); } /** - * Factory method for creating instances of class Attributes. - * - * @param behaviorClass + * Factory method for creating instances of class Attributes. Attributes are loaded from faces-config.xml. + * + * @param clazz * class object of a JSF behavior whose attributes will be stored * @param beanClass * class object of a managed bean */ - public static Attributes getBehaviorAttributes(Class<? extends BehaviorBase> behaviorClass, Class<?> beanClass) { - return new Attributes(behaviorClass, beanClass, true); + public static Attributes getBehaviorAttributesFromFacesConfig(Class<? extends BehaviorBase> clazz, Class<?> beanClass) { + return new Attributes(clazz, beanClass, false); } /** + * Factory method for creating instances of class Attributes. Attributes are loaded from class. + * + * @param clazz + * class object of a JSF behavior whose attributes will be stored + * @param beanClass + * class object of a managed bean + */ + public static Attributes getBehaviorAttributesFromClass(Class<? extends BehaviorBase> clazz, Class<?> beanClass) { + return new Attributes(clazz, beanClass, true); + } + + /** * Factory method for creating instances of class Attributes. * * @param behaviorClass @@ -260,7 +286,6 @@ */ public void clear() { attributes.clear(); - } /** @@ -546,7 +571,7 @@ */ public boolean hasSelectOptions(String attributeName) { List<SelectItem> options = attributes.get(attributeName).getSelectOptions(); - return options != null && options.size() != 0; + return options != null && !options.isEmpty(); } public boolean containsKey(Object key) { @@ -624,6 +649,7 @@ JAXBContext context = JAXBContext.newInstance(FacesConfigHolder.class); FacesConfigHolder facesConfigHolder = (FacesConfigHolder) context.createUnmarshaller().unmarshal(configFile); List<Component> components = facesConfigHolder.getComponents(); + List<Behavior> behaviors = facesConfigHolder.getBehaviors(); for (Component c : components) { if (c.getAttributes() == null) { @@ -643,6 +669,24 @@ logger.info("attributes for component " + c.getComponentClass().getName() + " loaded"); } + for (Behavior b : behaviors) { + if (b.getAttributes() == null) { + continue; + } + + // remove hidden attributes + Iterator<Attribute> i = b.getAttributes().iterator(); + while (i.hasNext()) { + Attribute a = i.next(); + if (a.isHidden() || "id".equals(a.getName()) || "binding".equals(a.getName())) { + i.remove(); + } + } + + richfacesAttributes.put(b.getBehaviorClass(), b.getAttributes()); + logger.info("attributes for behavior " + b.getBehaviorClass().getName() + " loaded"); + } + } catch (IOException ex) { logger.error("Input/output error.", ex); } catch (JAXBException ex) { @@ -655,6 +699,7 @@ private static final class FacesConfigHolder { private List<Component> components; + private List<Behavior> behaviors; @XmlElement(name = "component", namespace = "http://java.sun.com/xml/ns/javaee") public List<Component> getComponents() { @@ -664,5 +709,14 @@ public void setComponents(List<Component> components) { this.components = components; } + + @XmlElement(name = "behavior", namespace = "http://java.sun.com/xml/ns/javaee") + public List<Behavior> getBehaviors() { + return behaviors; + } + + public void setBehaviors(List<Behavior> behaviors) { + this.behaviors = behaviors; + } } } Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java (rev 0) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -0,0 +1,79 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer; + +import java.io.Serializable; +import java.util.List; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * Representation of a RichFaces behavior in faces-config.xml. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@XmlRootElement(name = "behavior", namespace = "http://java.sun.com/xml/ns/javaee") +public class Behavior implements Serializable { + + private static final long serialVersionUID = -1L; + private String description; + private String behaviorId; + private Class<?> behaviorClass; + private List<Attribute> attributes; + + @XmlElement(name = "behavior-id", namespace = "http://java.sun.com/xml/ns/javaee") + public String getBehaviorId() { + return behaviorId; + } + + public void setBehaviorId(String behaviorId) { + this.behaviorId = behaviorId; + } + + @XmlElement(name = "description", namespace = "http://java.sun.com/xml/ns/javaee") + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @XmlElement(name = "behavior-class", namespace = "http://java.sun.com/xml/ns/javaee") + public Class<?> getBehaviorClass() { + return behaviorClass; + } + + public void setBehaviorClass(Class<?> behaviorClass) { + this.behaviorClass = behaviorClass; + } + + @XmlElement(name = "property", namespace = "http://java.sun.com/xml/ns/javaee") + public List<Attribute> getAttributes() { + return attributes; + } + + public void setAttributes(List<Attribute> attributes) { + this.attributes = attributes; + } +} Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -65,7 +65,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getBehaviorAttributes(AjaxBehavior.class, getClass()); + attributes = Attributes.getBehaviorAttributesFromFacesConfig(AjaxBehavior.class, getClass()); + // the 'event' attribute for behavior tag must be a literal attributes.remove("event"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -58,11 +58,11 @@ logger.debug("initializing bean " + getClass().getName()); // initialize attributes - attributes = Attributes.getUIComponentAttributes(UIAttachQueue.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass()); initializeAttributes(attributes); attributes.setAttribute("requestDelay", 500); - attributes2 = Attributes.getUIComponentAttributes(UIAttachQueue.class, getClass()); + attributes2 = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass()); initializeAttributes(attributes2); attributes2.setAttribute("requestDelay", 1500); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,7 +57,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UICommandButton.class, getClass()); attributes.setAttribute("action", "first6CharsAction"); attributes.setAttribute("actionListener", "toUpperCaseActionListener"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,7 +57,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UICommandLink.class, getClass()); attributes.setAttribute("value", "command link"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -60,7 +60,7 @@ logger.debug("initializing bean " + getClass().getName()); year = Integer.parseInt(new SimpleDateFormat("yyyy").format(new Date())); - attributes = Attributes.getUIComponentAttributes(UIFunction.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIFunction.class, getClass()); attributes.setAttribute("name", "metamerFunction"); attributes.setAttribute("render", "time1, time2, year"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,8 +57,9 @@ logger.debug("initializing bean " + getClass().getName()); name = "John"; - attributes = Attributes.getUIComponentAttributes(UIAjaxLog.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIAjaxLog.class, getClass()); + attributes.setAttribute("rendered", true); attributes.setAttribute("level", "debug"); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -64,7 +64,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIMediaOutput.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIMediaOutput.class, getClass()); + attributes.setAttribute("session", true); attributes.setAttribute("rendered", true); attributes.remove("createContent"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -55,7 +55,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIOutputPanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIOutputPanel.class, getClass()); + attributes.setAttribute("ajaxRendered", true); attributes.setAttribute("layout", "block"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -58,7 +58,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIActionParameter.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIActionParameter.class, getClass()); + attributes.setAttribute("name", "param"); attributes.setAttribute("noEscape", true); attributes.setAttribute("value", "screen.width"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,7 +57,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIPoll.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIPoll.class, getClass()); + attributes.setAttribute("enabled", true); attributes.setAttribute("rendered", true); attributes.setAttribute("interval", 2500); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -73,7 +73,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIPush.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIPush.class, getClass()); attributes.setAttribute("interval", 1000); attributes.setAttribute("action", "increaseCounterAction"); attributes.setAttribute("actionListener", "increaseCounterActionListener"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -60,7 +60,7 @@ logger.debug("initializing bean " + getClass().getName()); // initialize attributes - attributes = Attributes.getUIComponentAttributes(UIQueue.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIQueue.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("requestDelay", 750); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -81,9 +81,8 @@ user1 = new Employee(); user2 = new Employee(); - attributes = Attributes.getUIComponentAttributes(UIRegion.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIRegion.class, getClass()); attributes.setAttribute("rendered", true); - } // getters and setters for page simple.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -143,7 +143,7 @@ } // initialize attributes - attributes = Attributes.getUIComponentAttributes(UIRepeat.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIRepeat.class, getClass()); attributes.setAttribute("rendered", true); // TODO has to be tested in other way attributes.remove("componentState"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -58,7 +58,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIStatus.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIStatus.class, getClass()); attributes.setAttribute("rendered", true); // hidden attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,7 +57,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlCommandButton.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(HtmlCommandButton.class, getClass()); attributes.setAttribute("value", "command button"); attributes.setAttribute("rendered", "true"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -61,7 +61,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlDataTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(HtmlDataTable.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("rows", 10); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlAccordion.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordion.class, getClass()); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlAccordionItem.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordionItem.class, getClass()); attributes.setAttribute("header", "Item 1"); attributes.setAttribute("name", "item1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -63,7 +63,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIAutocomplete.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIAutocomplete.class, getClass()); attributes.setAttribute("converterMessage", "converter message"); attributes.setAttribute("mode", "ajax"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -56,7 +56,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICalendar.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UICalendar.class, getClass()); attributes.setAttribute("datePattern", "MMM d, yyyy HH:mm"); attributes.setAttribute("direction", "bottom-right"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -53,7 +53,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICollapsiblePanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UICollapsiblePanel.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("header", "collapsible panel header"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIColumn.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIColumn.class, getClass()); attributes.setAttribute("colspan", 1); attributes.setAttribute("rendered", true); attributes.setAttribute("rowspan", 1); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -55,7 +55,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIColumnGroup.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIColumnGroup.class, getClass()); attributes.setAttribute("rendered", true); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -55,7 +55,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getBehaviorAttributes(ComponentControlBehavior.class, getClass()); + attributes = Attributes.getBehaviorAttributesFromFacesConfig(ComponentControlBehavior.class, getClass()); attributes.setAttribute("operation", "previous"); attributes.setAttribute("target", "scroller"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -58,7 +58,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIDataGrid.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIDataGrid.class, getClass()); attributes.setAttribute("columns", 3); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -57,7 +57,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIDataScroller.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIDataScroller.class, getClass()); attributes.setAttribute("boundaryControls", "show"); attributes.setAttribute("fastControls", "show"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -87,7 +87,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIDataTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIDataTable.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("rows", 10); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -53,7 +53,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIDropDownMenu.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDropDownMenu.class, getClass()); attributes.setAttribute("mode", "ajax"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -87,7 +87,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIExtendedDataTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIExtendedDataTable.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("rows", 30); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -60,7 +60,7 @@ logger.debug("initializing bean " + getClass().getName()); files = new ArrayList<UploadedFile>(); - attributes = Attributes.getUIComponentAttributes(UIFileUpload.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIFileUpload.class, getClass()); attributes.setAttribute("enabled", true); attributes.setAttribute("noDuplicate", false); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIInplaceInput.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIInplaceInput.class, getClass()); attributes.setAttribute("defaultLabel", "Click here to edit"); attributes.setAttribute("editEvent", "click"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -68,7 +68,7 @@ capitalsOptions.add(new SelectItem(capital.getState(), capital.getState())); } - attributes = Attributes.getUIComponentAttributes(UIInplaceSelect.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIInplaceSelect.class, getClass()); attributes.setAttribute("defaultLabel", "Click here to edit"); attributes.setAttribute("editEvent", "click"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlInputNumberSlider.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(HtmlInputNumberSlider.class, getClass()); attributes.setAttribute("enableManualInput", true); attributes.setAttribute("inputSize", 3); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlInputNumberSpinner.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlInputNumberSpinner.class, getClass()); attributes.setAttribute("enableManualInput", true); attributes.setAttribute("maxValue", 10); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -61,7 +61,7 @@ componentsDataList = new ArrayList<String>(); addComponent(); - attributes = Attributes.getUIComponentAttributes(UIJQuery.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIJQuery.class, getClass()); attributes.setAttribute("event", "click"); attributes.setAttribute("name", "bubu"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIList.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIList.class, getClass()); attributes.setAttribute("type", "ordered"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIMenuGroup.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIMenuGroup.class, getClass()); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIMenuItem.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIMenuItem.class, getClass()); attributes.setAttribute("icon", "/resources/images/icons/create_doc.gif"); attributes.setAttribute("label", "New"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIPanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIPanel.class, getClass()); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -55,7 +55,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIPanelMenu.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIPanelMenu.class, getClass()); attributes.setAttribute("groupCollapseIconLeft", "disc"); attributes.setAttribute("groupCollapseIconRight", "chevronDown"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIPopupPanel.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIPopupPanel.class, getClass()); attributes.setAttribute("header", "popup panel header"); attributes.setAttribute("height", 300); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -60,7 +60,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIProgressBar.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UIProgressBar.class, getClass()); attributes.setAttribute("maxValue", 100); attributes.setAttribute("minValue", 0); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -68,7 +68,7 @@ capitalsOptions.add(new SelectItem(capital.getState(), capital.getState())); } - attributes = Attributes.getUIComponentAttributes(UISelect.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UISelect.class, getClass()); attributes.setAttribute("defaultLabel", "Click here to edit"); attributes.setAttribute("enableManualInput", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -64,7 +64,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICollapsibleSubTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTable.class, getClass()); attributes.setAttribute("expandMode", "client"); attributes.setAttribute("expanded", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -64,7 +64,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UICollapsibleSubTableToggleControl.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTableToggleControl.class, getClass()); attributes.setAttribute("event", "click"); attributes.setAttribute("rendered", true); // TODO these attributes have to be tested in another way Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlTab.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(HtmlTab.class, getClass()); attributes.setAttribute("header", "tab1 header"); attributes.setAttribute("name", "tab1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlTabPanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(HtmlTabPanel.class, getClass()); attributes.setAttribute("activeItem", "tab1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getBehaviorAttributes(ToggleControl.class, getClass()); + attributes = Attributes.getBehaviorAttributesFromFacesConfig(ToggleControl.class, getClass()); attributes.setAttribute("targetPanel", "panel1"); attributes.setAttribute("targetItem", "item1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlTogglePanel.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanel.class, getClass()); attributes.setAttribute("activeItem", "item1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(HtmlTogglePanelItem.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanelItem.class, getClass()); attributes.setAttribute("name", "item1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIToolbar.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIToolbar.class, getClass()); attributes.setAttribute("height", 28); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIToolbarGroup.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIToolbarGroup.class, getClass()); attributes.setAttribute("rendered", true); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -58,7 +58,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UITooltip.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITooltip.class, getClass()); // set defaults Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -75,7 +75,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UITree.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITree.class, getClass()); attributes.get("rendered").setValue(true); attributes.get("toggleType").setValue("ajax"); attributes.get("selectionType").setValue("ajax"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UITreeModelAdaptor.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITreeModelAdaptor.class, getClass()); attributes.setAttribute("rendered", true); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -78,7 +78,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UITreeModelRecursiveAdaptor.class, getClass(), false); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITreeModelRecursiveAdaptor.class, getClass()); attributes.get("rendered").setValue(true); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2010-12-16 12:34:22 UTC (rev 20607) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2010-12-16 13:02:05 UTC (rev 20608) @@ -53,7 +53,7 @@ logger.debug("initializing bean " + getClass().getName()); for (int i = 0; i < attributes.length; i++) { - attributes[i] = Attributes.getUIComponentAttributes(UITreeModelAdaptor.class, getClass(), false); + attributes[i] = Attributes.getComponentAttributesFromFacesConfig(UITreeModelAdaptor.class, getClass()); attributes[i].get("rendered").setValue(true);