Author: abelevich Date: 2010-12-14 11:36:59 -0500 (Tue, 14 Dec 2010) New Revision: 20561 Removed: trunk/ui/misc/ui/src/main/config/ trunk/ui/misc/ui/src/main/resources/META-INF/cc.taglib.xml Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/component/UIHashParameter.java trunk/ui/misc/ui/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java Log: RF-9940, remove unnecessary faces-config.xml, cc.taglib.xml Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/component/UIHashParameter.java =================================================================== --- trunk/ui/misc/ui/src/main/java/org/richfaces/component/UIHashParameter.java 2010-12-14 15:58:51 UTC (rev 20560) +++ trunk/ui/misc/ui/src/main/java/org/richfaces/component/UIHashParameter.java 2010-12-14 16:36:59 UTC (rev 20561) @@ -31,10 +31,20 @@ import javax.faces.component.UIComponentBase; import javax.faces.component.UIParameter; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; + /** * @author Anton Belevich * */ + +@JsfComponent( + type = UIHashParameter.COMPONENT_TYPE, + family = UIHashParameter.COMPONENT_FAMILY, + tag = @Tag(name = "hashParam", handler="javax.faces.view.facelets.ComponentHandler") +) public class UIHashParameter extends UIComponentBase { public static final String COMPONENT_TYPE = "org.richfaces.HashParameter"; @@ -50,6 +60,7 @@ setRendererType(null); } + @Attribute public String getName() { return (String) getStateHelper().eval(PropertyKeys.name); } @@ -57,7 +68,8 @@ public void setName(String name) { getStateHelper().put(PropertyKeys.name, name); } - + + @Attribute public Map<String, Object> getValue() { List<UIComponent> children = getChildren(); Map<String, Object> parameters = new HashMap<String, Object>(); Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java =================================================================== --- trunk/ui/misc/ui/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java 2010-12-14 15:58:51 UTC (rev 20560) +++ trunk/ui/misc/ui/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java 2010-12-14 16:36:59 UTC (rev 20561) @@ -36,7 +36,11 @@ * @author Anton Belevich * */ -@JsfBehavior(id = "org.richfaces.behavior.ComponentControlBehavior", tag = @Tag(name = "componentControl", handler = "org.richfaces.taglib.ComponentControlHandler", type = TagType.Facelets)) +@JsfBehavior( + id = "org.richfaces.behavior.ComponentControlBehavior", + tag = @Tag(name = "componentControl", + handler = "org.richfaces.taglib.ComponentControlHandler", type = TagType.Facelets) +) public class ComponentControlBehavior extends ClientBehavior { public static final String BEHAVIOR_ID = "org.richfaces.behavior.ComponentControlBehavior"; Deleted: trunk/ui/misc/ui/src/main/resources/META-INF/cc.taglib.xml =================================================================== --- trunk/ui/misc/ui/src/main/resources/META-INF/cc.taglib.xml 2010-12-14 15:58:51 UTC (rev 20560) +++ trunk/ui/misc/ui/src/main/resources/META-INF/cc.taglib.xml 2010-12-14 16:36:59 UTC (rev 20561) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" - version="2.0" - id="cc"> - <namespace>http://richfaces.org/componentControl</namespace> - <tag> - <tag-name>hashParam</tag-name> - <component> - <component-type>org.richfaces.HashParameter</component-type> - <handler-class>javax.faces.view.facelets.ComponentHandler</handler-class> - </component> - - </tag> -</facelet-taglib> \ No newline at end of file