Author: Alex.Kolonitsky Date: 2010-04-20 11:51:44 -0400 (Tue, 20 Apr 2010) New Revision: 16778 Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml Log: RF-7826 Migrate A1 components to new CDK Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Tag.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -53,5 +53,5 @@ public String baseClass() default ""; public boolean generate() default false; - + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -200,16 +200,21 @@ @Override public void processType(final BeanModelBase component, TypeElement element) throws CdkException { - - // Process XML files with standard attributes definitions. + log.debug("AttributesProcessorImpl.processType"); + log.debug(" -> component = " + component); + log.debug(" -> typeElement = " + element.getQualifiedName()); + + log.debug(" -- Process XML files with standard attributes definitions."); + log.debug(" -> sourceUtils.visitSupertypes..."); SourceUtils sourceUtils = getSourceUtils(); sourceUtils.visitSupertypes(element, new SuperTypeVisitor() { @Override public void visit(TypeMirror type) { try { - component.getAttributes().addAll(parseProperties( - CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml")); + log.debug(" -> visit - " + type.toString()); + component.getAttributes().addAll( + parseProperties(CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml")); } catch (CdkException e) { // TODO - log errors ? } @@ -218,7 +223,8 @@ }); - Set<BeanProperty> properties = Sets.newHashSet(); + log.debug(" -- Process Java files."); + Set<BeanProperty> properties = Sets.newHashSet(); properties.addAll(sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, element)); properties.addAll(sourceUtils.getAbstractBeanProperties(element)); // TODO - encapsulate attribute builder into utility class. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/taghandler/TagHandlerModule.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -23,6 +23,8 @@ package org.richfaces.cdk.generate.java.taghandler; import com.google.inject.AbstractModule; +import com.google.inject.multibindings.Multibinder; +import org.richfaces.cdk.CdkWriter; /** * @author akolonitsky @@ -32,9 +34,7 @@ @Override protected void configure() { -/* Multibinder.newSetBinder(binder(), CdkWriter.class) .addBinding().to(TagHandlerWriter.class); -*/ } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -58,6 +58,12 @@ private ComponentLibrary componentLibrary; + private String id; + + public TaglibGeneratorVisitor(String id) { + this.id = id; + } + public Document getDocument() { return document; } @@ -72,7 +78,7 @@ faceletTaglib = document.addElement("facelet-taglib", "http://java.sun.com/xml/ns/javaee"); faceletTaglib.addAttribute("version", "2.0"); - faceletTaglib.addAttribute("id", "a4j"); // TODO do it as param param + faceletTaglib.addAttribute("id", id); // TODO do it as param param faceletTaglib.addElement("namespace").addText("http://rich...; // TODO do it as param param } @@ -149,7 +155,9 @@ private void appendAttributs(Element tag, BeanModelBase model) { for (PropertyBase entry : model.getAttributes()) { - createAttributeElement(tag, entry.getName(), entry); + if (!entry.isHidden() && !entry.isReadOnly()) { + createAttributeElement(tag, entry.getName(), entry); + } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibWriter.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -48,13 +48,12 @@ @Output(Outputs.RESOURCES) private FileManager output; - /* - * (non-Javadoc) - * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary) - */ + // TODO set it as parametr + private String id = "a4j"; + @Override public void render() throws CdkException { - TaglibGeneratorVisitor visitor = new TaglibGeneratorVisitor(); + TaglibGeneratorVisitor visitor = new TaglibGeneratorVisitor(id); library.accept(visitor); try { @@ -71,7 +70,7 @@ protected Writer getOutput() throws CdkException { try { - return output.createOutput("META-INF/taglib.xml", library.lastModified()); + return output.createOutput("META-INF/" + id + ".taglib.xml", library.lastModified()); } catch (IOException e) { throw new CdkException(e); } Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes.ftl 2010-04-20 15:51:44 UTC (rev 16778) @@ -3,14 +3,7 @@ } <#list generatedAttributes as attribute> - - public ${attribute.simpleTypeName} ${attribute.getterName}() { - return (${attribute.typeForCasting}) getStateHelper().eval(Properties.${attribute.name}); - } - - public void ${attribute.setterName}(${attribute.simpleTypeName} ${attribute.name}) { - getStateHelper().put(Properties.${attribute.name}, ${attribute.name}); - } + <#include "_attribute_accessors.ftl"> </#list> private StateHelper stateHelper = null; Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-04-20 15:51:44 UTC (rev 16778) @@ -63,13 +63,6 @@ } <#list generatedAttributes as attribute> - - public ${attribute.simpleTypeName} ${attribute.getterName}() { - return (${attribute.typeForCasting}) getStateHelper().eval(Properties.${attribute.name}<#if attribute.defaultValue?exists>, ${attribute.defaultValue}</#if>); - } - - public void ${attribute.setterName}(${attribute.simpleTypeName} ${attribute.name}) { - getStateHelper().put(Properties.${attribute.name}, ${attribute.name}); - } + <#include "_attribute_accessors.ftl"> </#list> } \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -32,6 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.cdk.CdkTestRunner; +import org.richfaces.cdk.Logger; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.EventName; @@ -59,6 +60,9 @@ @Inject private ComponentClassGenerator generator; + @Inject + private Logger log; + @Test public void testGetOutputFileComponent() throws Exception { final StringWriter outputWriter = new StringWriter(); @@ -70,10 +74,12 @@ library.getComponents().add(component); generator.generate(component); -// System.out.println(outputWriter); + log.debug(outputWriter.toString()); + verify(output); -// TODI - any change in the template breaks test, make comperison more intellectual ? -// compare(outputWriter, "GeneratedComponent.java"); + +// TODO - any change in the template breaks test, make comperison more intellectual ? + compare(outputWriter, "GeneratedComponent.java"); } public ComponentClassGenerator getGenerator() { Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.cdk.CdkTestRunner; +import org.richfaces.cdk.Logger; import org.richfaces.cdk.generate.freemarker.PropertyModel; import org.richfaces.cdk.model.ClassName; import org.richfaces.cdk.model.ComponentLibrary; @@ -51,6 +52,9 @@ @Inject private ConverterClassGenerator generator; + @Inject + private Logger log; + @Test public void testGetOutputFileValidator() throws Exception { final StringWriter outputWriter = new StringWriter(); @@ -77,7 +81,7 @@ library.getConverters().add(converter); generator.generate(converter); -// System.out.println(outputWriter); + log.debug(outputWriter.toString()); verify(output); compare(outputWriter, "GeneratedConverter.java"); Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/TaglibGeneratorVisitorTest.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -56,7 +56,7 @@ ComponentLibrary library = new ComponentLibrary(); library.getValidators().add(validator); - TaglibGeneratorVisitor visitor = new TaglibGeneratorVisitor(); + TaglibGeneratorVisitor visitor = new TaglibGeneratorVisitor("a4j"); library.accept(visitor); // visitor.generate(); Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -44,9 +44,9 @@ * **/ @Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"}) -public class GeneratedComponent extends UIOutput - implements ClientBehaviorHolder - { +public class GeneratedComponent extends UIOutput + implements ClientBehaviorHolder + { public static final String COMPONENT_TYPE="foo.bar"; @@ -55,6 +55,7 @@ private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( "id", "action" + )); public Collection<String> getEventNames() { @@ -74,62 +75,63 @@ listStrings, listInteger, list + } public Object getTestValue() { - return (Object) getStateHelper().eval(Properties.testValue); + return (Object) getStateHelper().eval(Properties.testValue); } public void setTestValue(Object testValue) { - getStateHelper().put(Properties.testValue, testValue); + getStateHelper().put(Properties.testValue, testValue); } public Boolean isTestFlag() { - return (Boolean) getStateHelper().eval(Properties.testFlag); + return Boolean.valueOf(getStateHelper().eval(Properties.testFlag).toString()); } public void setTestFlag(Boolean testFlag) { - getStateHelper().put(Properties.testFlag, testFlag); + getStateHelper().put(Properties.testFlag, testFlag); } public MethodBinding getTestBinding() { - return (MethodBinding) getStateHelper().eval(Properties.testBinding); + return (MethodBinding) getStateHelper().get(Properties.testBinding); } public void setTestBinding(MethodBinding testBinding) { - getStateHelper().put(Properties.testBinding, testBinding); + getStateHelper().put(Properties.testBinding, testBinding); } public MethodExpression getTestExpr() { - return (MethodExpression) getStateHelper().eval(Properties.testExpr); + return (MethodExpression) getStateHelper().get(Properties.testExpr); } public void setTestExpr(MethodExpression testExpr) { - getStateHelper().put(Properties.testExpr, testExpr); + getStateHelper().put(Properties.testExpr, testExpr); } public ArrayList getListStrings() { - return (ArrayList) getStateHelper().eval(Properties.listStrings); + return (ArrayList) getStateHelper().eval(Properties.listStrings); } public void setListStrings(ArrayList listStrings) { - getStateHelper().put(Properties.listStrings, listStrings); + getStateHelper().put(Properties.listStrings, listStrings); } public ArrayList getListInteger() { - return (ArrayList) getStateHelper().eval(Properties.listInteger); + return (ArrayList) getStateHelper().eval(Properties.listInteger); } public void setListInteger(ArrayList listInteger) { - getStateHelper().put(Properties.listInteger, listInteger); + getStateHelper().put(Properties.listInteger, listInteger); } public ArrayList getList() { - return (ArrayList) getStateHelper().eval(Properties.list); + return (ArrayList) getStateHelper().eval(Properties.list); } public void setList(ArrayList list) { - getStateHelper().put(Properties.list, list); + getStateHelper().put(Properties.list, list); } } \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -56,43 +56,43 @@ public PropertyModel getMyClass() { - return (PropertyModel) getStateHelper().eval(Properties.myClass); + return (PropertyModel) getStateHelper().eval(Properties.myClass); } public void setMyClass(PropertyModel myClass) { - getStateHelper().put(Properties.myClass, myClass); + getStateHelper().put(Properties.myClass, myClass); } public Object getTestObject() { - return (Object) getStateHelper().eval(Properties.testObject); + return (Object) getStateHelper().eval(Properties.testObject); } public void setTestObject(Object testObject) { - getStateHelper().put(Properties.testObject, testObject); + getStateHelper().put(Properties.testObject, testObject); } public Boolean isTestBoolean() { - return (Boolean) getStateHelper().eval(Properties.testBoolean); + return Boolean.valueOf(getStateHelper().eval(Properties.testBoolean).toString()); } public void setTestBoolean(Boolean testBoolean) { - getStateHelper().put(Properties.testBoolean, testBoolean); + getStateHelper().put(Properties.testBoolean, testBoolean); } public Integer getTestInteger() { - return (Integer) getStateHelper().eval(Properties.testInteger); + return (Integer) getStateHelper().eval(Properties.testInteger); } public void setTestInteger(Integer testInteger) { - getStateHelper().put(Properties.testInteger, testInteger); + getStateHelper().put(Properties.testInteger, testInteger); } public boolean isVisible() { - return (Boolean) getStateHelper().eval(Properties.visible); + return Boolean.valueOf(getStateHelper().eval(Properties.visible).toString()); } public void setVisible(boolean visible) { - getStateHelper().put(Properties.visible, visible); + getStateHelper().put(Properties.visible, visible); } private StateHelper stateHelper = null; @@ -143,4 +143,4 @@ initialState = false; } -} +} \ No newline at end of file Modified: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -21,7 +21,7 @@ */ @JsfBehavior( id = "org.ajax4jsf.behavior.Ajax", - tag = @Tag(name = "ajax", handler = "org.richfaces.taglib.html.facelets.AjaxHandler", type = TagType.Facelets) + tag = @Tag(name = "ajax", handler = "org.richfaces.view.facelets.html.AjaxHandler", type = TagType.Facelets) ) @FacesBehavior(value = "org.ajax4jsf.behavior.Ajax") public class AjaxBehavior extends javax.faces.component.behavior.AjaxBehavior implements AjaxClientBehavior { Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -20,22 +20,20 @@ */ - package org.richfaces.component; -import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.JsfComponent; -import javax.faces.component.UIComponentBase; +import javax.faces.component.UICommand; /** * @author Nick Belaevski - * */ @JsfComponent -public abstract class AbstractCommandLink extends UIComponentBase { - +public abstract class AbstractCommandLink extends UICommand { + public static final String COMPONENT_TYPE = "org.richfaces.CommandLink"; public static final String COMPONENT_FAMILY = "org.richfaces.CommandLink"; Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -47,7 +47,7 @@ * */ @JsfComponent( - tag = @Tag(generate = true, handler = "org.richfaces.taglib.html.facelets.MediaOutputHandler") + tag = @Tag(generate = false, handler = "org.richfaces.view.facelets.html.MediaOutputHandler") ) public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2 { @@ -160,13 +160,6 @@ public abstract void setCoords(String coords); - /** - * TODO original implemenattion - * - * public MethodExpression getCreateContentExpression() { - * return (MethodExpression) getStateHelper().get(PropertyKeys.createContentExpression); - * } - * */ public abstract MethodExpression getCreateContentExpression(); public abstract String getDeclare(); @@ -212,7 +205,7 @@ public abstract String getVspace(); -// todo @Attribute(events = @EventName("blur")) + @Attribute(events = @EventName("blur")) public abstract String getOnblur(); @Attribute(events = @EventName("click")) @@ -221,7 +214,7 @@ @Attribute(events = @EventName("dblclick")) public abstract String getOndblclick(); -// todo @Attribute(events = @EventName("focus")) + @Attribute(events = @EventName("focus")) public abstract String getOnfocus(); @Attribute(events = @EventName("keydown")) Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-04-20 15:51:44 UTC (rev 16778) @@ -45,7 +45,7 @@ * */ @JsfComponent( - tag = @Tag(generate = true, handler = "org.richfaces.taglib.html.facelets.AjaxPushHandler") + tag = @Tag(generate = true, handler = "org.richfaces.view.facelets.html.AjaxPushHandler") ) public abstract class AbstractPush extends UICommand { Modified: root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-20 15:51:44 UTC (rev 16778) @@ -66,7 +66,7 @@ <component> <component-type>org.richfaces.Push</component-type> <renderer-type>org.richfaces.PushRenderer</renderer-type> - <handler-class>org.richfaces.taglib.html.facelets.AjaxPushHandler</handler-class> + <handler-class>org.richfaces.view.facelets.html.AjaxPushHandler</handler-class> </component> </tag> <tag> @@ -86,7 +86,7 @@ <tag-name>ajax</tag-name> <behavior> <behavior-id>org.ajax4jsf.behavior.Ajax</behavior-id> - <handler-class>org.richfaces.taglib.html.facelets.AjaxHandler</handler-class> + <handler-class>org.richfaces.view.facelets.html.AjaxHandler</handler-class> </behavior> </tag> </facelet-taglib> Modified: root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2010-04-20 15:48:45 UTC (rev 16777) +++ root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2010-04-20 15:51:44 UTC (rev 16778) @@ -12,7 +12,7 @@ </ordering> <factory> - <tag-handler-delegate-factory>org.richfaces.taglib.html.facelets.BehaviorsTagHandlerDelegateFactoryImpl</tag-handler-delegate-factory> + <tag-handler-delegate-factory>org.richfaces.view.facelets.html.BehaviorsTagHandlerDelegateFactoryImpl</tag-handler-delegate-factory> </factory> </faces-config> \ No newline at end of file