Author: abelevich Date: 2010-06-11 09:58:56 -0400 (Fri, 11 Jun 2010) New Revision: 17614 Removed: root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/resources/META-INF/faces-config.xml Modified: root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/config/faces-config.xml root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java Log: fixes for AS6 Modified: root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/config/faces-config.xml =================================================================== --- root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/config/faces-config.xml 2010-06-11 13:53:56 UTC (rev 17613) +++ root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/config/faces-config.xml 2010-06-11 13:58:56 UTC (rev 17614) @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -- <render-kit> - <render-kit-id>HTML_BASIC</render-kit-id> -- <client-behavior-renderer> - <client-behavior-renderer-type>org.richfaces.behavior.ComponentControlBehavior</client-behavior-renderer-type> - <client-behavior-renderer-class>org.richfaces.renderkit.ComponentControlBehaviorRenderer</client-behavior-renderer-class> - </client-behavior-renderer> - </render-kit> +<component> + <component-type>org.richfaces.HashParameter</component-type> + <component-class>org.richfaces.component.UIHashParameter</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> +</component> + <render-kit> + <render-kit-id>HTML_BASIC</render-kit-id> + <client-behavior-renderer> + <client-behavior-renderer-type>org.richfaces.behavior.ComponentControlBehavior</client-behavior-renderer-type> + <client-behavior-renderer-class>org.richfaces.renderkit.ComponentControlBehaviorRenderer</client-behavior-renderer-class> + </client-behavior-renderer> + </render-kit> </faces-config> \ No newline at end of file Modified: root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java =================================================================== --- root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java 2010-06-11 13:53:56 UTC (rev 17613) +++ root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/java/org/richfaces/component/behavior/ComponentControlBehavior.java 2010-06-11 13:58:56 UTC (rev 17614) @@ -26,15 +26,17 @@ import java.util.List; import javax.faces.component.UIComponent; -import javax.faces.component.behavior.FacesBehavior; import org.ajax4jsf.component.behavior.ClientBehavior; +import org.richfaces.cdk.annotations.JsfBehavior; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author Anton Belevich * */ -@FacesBehavior(value = "org.richfaces.behavior.ComponentControlBehavior") +@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"; @@ -42,7 +44,7 @@ private List<UIComponent> children; enum PropertyKeys { - event, target, selector, parameters, operation + event, target, selector, operation } public List<UIComponent> getChildren() { @@ -96,7 +98,7 @@ } else if (compare(PropertyKeys.target, name)) { setTarget((String) value); } else if (compare(PropertyKeys.selector, name)) { - setSelector((String) name); + setSelector((String) value); } } } Deleted: root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/resources/META-INF/faces-config.xml 2010-06-11 13:53:56 UTC (rev 17613) +++ root/ui/misc/branches/richfaces-ui-misc-4.0.0.Alpha2/componentcontrol/src/main/resources/META-INF/faces-config.xml 2010-06-11 13:58:56 UTC (rev 17614) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - -<component> - <component-type>org.richfaces.HashParameter</component-type> - <component-class>org.richfaces.component.UIHashParameter</component-class> - <component-extension> - <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... - </component-extension> - </component> -</faces-config> \ No newline at end of file