Author: Alex.Kolonitsky Date: 2010-05-11 10:04:24 -0400 (Tue, 11 May 2010) New Revision: 16987 Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java Log: fix generation taglib.xml and faces-config.xml Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -29,6 +29,7 @@ import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -36,7 +37,7 @@ * */ @JsfComponent( - tag = @Tag(name = "jsFunction") + tag = @Tag(name = "jsFunction", type = TagType.Facelets) ) public abstract class AbstractAjaxFunction extends UICommand { Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -31,6 +31,7 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author Nick Belaevski @@ -41,7 +42,7 @@ @ResourceDependency(name = "richfaces-jsf-log.js"), @ResourceDependency(name = "richfaces.css") }) @JsfComponent( - tag = @Tag(name = "log"), + tag = @Tag(name = "log", type = TagType.Facelets), renderer = @JsfRenderer(template = "/org/ajax4jsf/renderkit/html/log.template.xml") ) public abstract class AbstractAjaxLog extends UIComponentBase { Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -27,11 +27,15 @@ import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author Nick Belaevski */ -@JsfComponent +@JsfComponent ( + tag = @Tag(type = TagType.Facelets) +) public abstract class AbstractCommandLink extends UICommand { public static final String COMPONENT_TYPE = "org.richfaces.CommandLink"; Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -29,6 +29,7 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Signature; import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; import org.richfaces.resource.MediaOutputResource; import org.richfaces.webapp.taglib.MethodBindingMethodExpressionAdaptor; import org.richfaces.webapp.taglib.MethodExpressionMethodBindingAdaptor; @@ -47,7 +48,7 @@ * */ @JsfComponent( - tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.html.MediaOutputHandler") + tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.html.MediaOutputHandler", type = TagType.Facelets) ) public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2 { Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/AbstractRegion.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -27,13 +27,14 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author Nick Belaevski * */ @JsfComponent( - tag = @Tag(name = "region") + tag = @Tag(name = "region", type = TagType.Facelets) ) public abstract class AbstractRegion extends UIComponentBase implements MetaComponentResolver, AjaxContainer { Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/UIRepeat.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -23,12 +23,13 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; /** * @author Nick Belaevski * */ -@JsfComponent(generate = "", tag = @Tag(name = "repeat")) +@JsfComponent(generate = "", tag = @Tag(name = "repeat", type = TagType.Facelets)) public class UIRepeat extends UISequence { public static final String COMPONENT_TYPE = "org.richfaces.Repeat"; Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2010-05-11 13:54:30 UTC (rev 16986) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/CommandButtonRendererBase.java 2010-05-11 14:04:24 UTC (rev 16987) @@ -26,6 +26,7 @@ import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.renderkit.AjaxCommandRendererBase; +import javax.faces.component.UICommand; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; @@ -38,6 +39,10 @@ @JsfRenderer public abstract class CommandButtonRendererBase extends AjaxCommandRendererBase { + public static final String COMPONENT_FAMILY = UICommand.COMPONENT_FAMILY; + + public static final String RENDERER_TYPE = "org.richfaces.CommandButtonRenderer"; + protected void encodeTypeAndImage(FacesContext context, UIComponent uiComponent) throws IOException { ResponseWriter writer = context.getResponseWriter(); String type = (String) uiComponent.getAttributes().get("type");