Author: nbelaevski Date: 2009-06-30 08:06:39 -0400 (Tue, 30 Jun 2009) New Revision: 14748 Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxContainerBaseRule.java branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java Log: Facelets tag handlers updated to compile with JSF 2.0 Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java 2009-06-30 11:46:11 UTC (rev 14747) +++ branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxActionsRule.java 2009-06-30 12:06:39 UTC (rev 14748) @@ -22,15 +22,15 @@ package org.ajax4jsf.webapp.taglib; import javax.faces.component.ActionSource; +import javax.faces.component.ActionSource2; import javax.faces.event.ActionEvent; +import javax.faces.event.MethodExpressionActionListener; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.el.LegacyMethodBinding; -import com.sun.facelets.tag.MetaRule; -import com.sun.facelets.tag.Metadata; -import com.sun.facelets.tag.MetadataTarget; -import com.sun.facelets.tag.TagAttribute; - /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:21 $ @@ -51,9 +51,9 @@ } public void applyMetadata(FaceletContext ctx, Object instance) { - ((ActionSource) instance).setAction(new LegacyMethodBinding( - this.attr.getMethodExpression(ctx, String.class, - AjaxActionsRule.ACTION_SIG))); + ((ActionSource2) instance).setActionExpression( + this.attr.getMethodExpression(ctx, String.class, + AjaxActionsRule.ACTION_SIG)); } } @@ -66,10 +66,9 @@ } public void applyMetadata(FaceletContext ctx, Object instance) { - ((ActionSource) instance) - .setActionListener(new LegacyMethodBinding(this.attr - .getMethodExpression(ctx, null, - AjaxActionsRule.ACTION_LISTENER_SIG))); + ((ActionSource) instance).addActionListener(new MethodExpressionActionListener(this.attr + .getMethodExpression(ctx, null, + AjaxActionsRule.ACTION_LISTENER_SIG))); } } Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java 2009-06-30 11:46:11 UTC (rev 14747) +++ branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxComponentHandler.java 2009-06-30 12:06:39 UTC (rev 14748) @@ -22,13 +22,12 @@ package org.ajax4jsf.webapp.taglib; import javax.faces.component.ActionSource; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.MetaRuleset; import org.ajax4jsf.component.AjaxContainerBase; -import com.sun.facelets.tag.MetaRuleset; -import com.sun.facelets.tag.jsf.ComponentConfig; -import com.sun.facelets.tag.jsf.ComponentHandler; - /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:23 $ Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxContainerBaseRule.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxContainerBaseRule.java 2009-06-30 11:46:11 UTC (rev 14747) +++ branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxContainerBaseRule.java 2009-06-30 12:06:39 UTC (rev 14748) @@ -21,15 +21,15 @@ package org.ajax4jsf.webapp.taglib; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; + import org.ajax4jsf.component.AjaxContainerBase; import org.ajax4jsf.event.AjaxEvent; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.tag.MetaRule; -import com.sun.facelets.tag.Metadata; -import com.sun.facelets.tag.MetadataTarget; -import com.sun.facelets.tag.TagAttribute; - /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:21 $ Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java 2009-06-30 11:46:11 UTC (rev 14747) +++ branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/AjaxReRendrRule.java 2009-06-30 12:06:39 UTC (rev 14748) @@ -23,15 +23,15 @@ import java.util.Set; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; + import org.ajax4jsf.component.AjaxComponent; import org.ajax4jsf.renderkit.AjaxRendererUtils; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.tag.MetaRule; -import com.sun.facelets.tag.Metadata; -import com.sun.facelets.tag.MetadataTarget; -import com.sun.facelets.tag.TagAttribute; - /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ Modified: branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java =================================================================== --- branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java 2009-06-30 11:46:11 UTC (rev 14747) +++ branches/jsf2.0/framework/impl/src/main/java/org/ajax4jsf/webapp/taglib/EmptyHandler.java 2009-06-30 12:06:39 UTC (rev 14748) @@ -8,12 +8,11 @@ import javax.el.ELException; import javax.faces.FacesException; import javax.faces.component.UIComponent; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.FaceletException; +import javax.faces.view.facelets.TagConfig; +import javax.faces.view.facelets.TagHandler; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.FaceletException; -import com.sun.facelets.tag.TagConfig; -import com.sun.facelets.tag.TagHandler; - /** * This if "empty" facelets tag handler stub. This handler used to ignore tags on a page. * At most, it used to bypass <jsp:root> and other tags, so we can use same markup for an facelets an jsp pages.