Author: manaRH Date: 2012-05-16 16:47:45 -0400 (Wed, 16 May 2012) New Revision: 14700
Added: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java Removed: branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/defaultAction.xml branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/equalityValidator.xml branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/validateAll.xml Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java Log: JBSEAM-4875 added missing tags Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-05-16 20:47:45 UTC (rev 14700) @@ -10,7 +10,7 @@ <name>Seam UI JSF2 support</name> <properties> - <version.richfaces>4.3.0-SNAPSHOT</version.richfaces> + <version.richfaces>4.2.2.Final</version.richfaces> </properties> <build> Deleted: branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/defaultAction.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/defaultAction.xml 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/defaultAction.xml 2012-05-16 20:47:45 UTC (rev 14700) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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://jboss.org/schema/richfaces/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <component> - <description> - <![CDATA[Simulate pressing the action source when "enter" is pressed.]]> - </description> - <display-name>org.jboss.seam.ui.DefaultAction</display-name> - <component-type>org.jboss.seam.ui.DefaultAction</component-type> - <component-class>org.jboss.seam.ui.component.html.HtmlDefaultAction</component-class> - <component-extension> - <cdk:generate>false</cdk:generate> - <cdk:renderer-type>org.jboss.seam.ui.DefaultActionRenderer</cdk:renderer-type> - </component-extension> - </component> -</faces-config> \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/equalityValidator.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/equalityValidator.xml 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/equalityValidator.xml 2012-05-16 20:47:45 UTC (rev 14700) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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://jboss.org/schema/richfaces/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <component> - <description> - <![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]> - </description> - <display-name>org.jboss.seam.ui.EqualityValidator</display-name> - <component-type>org.jboss.seam.ui.EqualityValidator</component-type> - <component-class>org.jboss.seam.ui.component.html.HtmlEqualityValidator</component-class> - <property> - <description>Id of component to validate against</description> - <property-name>for</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>Error message to show</description> - <property-name>message</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>Message id to use on failure</description> - <property-name>messageId</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>Operation to use.</description> - <property-name>operator</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>True if a value is required for the filed to validate (default:true)</description> - <property-name>required</property-name> - <property-class>boolean</property-class> - <default-value>true</default-value> - </property> - <component-extension> - <cdk:generate>false</cdk:generate> - <cdk:renderer-type>org.jboss.seam.ui.renderkit.EqualityValidatorRendererBase</cdk:renderer-type> - </component-extension> - - </component> - </faces-config> \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/validateAll.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/validateAll.xml 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/config/component/validateAll.xml 2012-05-16 20:47:45 UTC (rev 14700) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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://jboss.org/schema/richfaces/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component> - <description> - <![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]> - </description> - <component-type>org.jboss.seam.ui.ValidateAll</component-type> - <component-class>org.jboss.seam.ui.component.html.HtmlValidateAll</component-class> - - <component-extension> - <cdk:generate>false</cdk:generate> - <cdk:base-class>org.jboss.seam.ui.ValidateAllRenderer</cdk:base-class> - <cdk:component-family>javax.faces.Input</cdk:component-family> - <cdk:renderer-type>org.jboss.seam.ui.renderkit.ValidateAllRendererBase</cdk:renderer-type> - <cdk:tag> - <cdk:tag-name>validateAll</cdk:tag-name> - <cdk:tag-type>Facelets</cdk:tag-type> - </cdk:tag> - </component-extension> - </component> -</faces-config> \ No newline at end of file Added: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDefaultAction.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -0,0 +1,24 @@ +/** + * + */ +package org.jboss.seam.ui.component; + +import javax.faces.component.UIOutput; + +import org.richfaces.cdk.annotations.Description; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.cdk.annotations.Tag; + +/** + * @author mnovotny + * + */ +@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.DefaultAction",value="Simulate pressing the action source when 'enter' is pressed."), +family="org.jboss.seam.ui.DefaultAction", type="org.jboss.seam.ui.DefaultAction",generate="org.jboss.seam.ui.component.html.HtmlDefaultAction", +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="defaultAction"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.DefaultActionRenderer", family="org.jboss.seam.ui.DefaultActionRenderer")) +public abstract class UIDefaultAction extends UIOutput +{ + +} Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -14,7 +14,7 @@ * @author Daniel Roth */ @JsfComponent(description=@Description(displayName="org.jboss.seam.ui.EqualityValidator",value="Validate all child JSF input fields against the bound propertys using Hibernate Validator."), -family="org.jboss.seam.ui.EqualityValidator", type="org.jboss.seam.ui.EqualityValidator",generate="org.jboss.seam.ui.component.html.HtmlEqualityValidator", +family="org.jboss.seam.ui.EqualityValidator", type="org.jboss.seam.ui.EqualityValidator", generate="org.jboss.seam.ui.component.html.HtmlEqualityValidator", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="equalityValidator"), renderer = @JsfRenderer(type="org.jboss.seam.ui.EqualityValidatorRenderer", family="org.jboss.seam.ui.EqualityValidatorRenderer"), attributes = {"equalityValidator.xml" }) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -19,9 +19,9 @@ * */ @JsfComponent(description=@Description(displayName="org.jboss.seam.ui.FileUpload",value="Renders a file upload control. This control must be used within a form with an encoding type of multipart/form-data"), -family="org.jboss.seam.ui.FileUpload", type="org.jboss.seam.ui.FileUpload",generate="org.jboss.seam.ui.component.html.HtmlButton", +family="org.jboss.seam.ui.FileUpload", type="org.jboss.seam.ui.FileUpload",generate="org.jboss.seam.ui.component.html.HtmlFileUpload", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="fileUpload"), -renderer = @JsfRenderer(type="org.jboss.seam.ui.renderkit.FileUploadRendererBase", family="org.jboss.seam.ui.FileUploadRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.FileUploadRenderer", family="org.jboss.seam.ui.FileUploadRenderer"), attributes = {"fileUpload.xml" }) public abstract class UIFileUpload extends UIInput { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -2,10 +2,19 @@ import javax.faces.component.UIComponentBase; +import org.richfaces.cdk.annotations.Description; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.cdk.annotations.Tag; + /** * JSF component class * */ +@JsfComponent(description=@Description(displayName="org.jboss.seam.ui.ValidateAll",value="<![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]>"), +family="org.jboss.seam.ui.ValidateAll", type="org.jboss.seam.ui.ValidateAll",generate="org.jboss.seam.ui.component.html.HtmlValidateAll", +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="validateAll"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.ValidateAllRenderer", family="org.jboss.seam.ui.ValidateAllRenderer")) public abstract class UIValidateAll extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -7,11 +7,12 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; /** * @author Dennis Byrne */ - +@FacesConverter(value="org.jboss.seam.ui.AtomicBooleanConverter") public class AtomicBooleanConverter implements Converter { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -6,11 +6,12 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; /** * @author Dennis Byrne */ - +@FacesConverter(value="org.jboss.seam.ui.AtomicIntegerConverter") public class AtomicIntegerConverter implements Converter { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -6,11 +6,12 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; /** * @author Dennis Byrne */ - +@FacesConverter(value="org.jboss.seam.ui.AtomicLongConverter") public class AtomicLongConverter implements Converter { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -23,8 +23,11 @@ import java.util.TimeZone; +import javax.faces.convert.FacesConverter; + import org.jboss.seam.contexts.Contexts; +@FacesConverter(value="org.jboss.seam.ui.DateTimeConverter") public class DateTimeConverter extends javax.faces.convert.DateTimeConverter{ public DateTimeConverter() Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -6,7 +6,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; +@FacesConverter(value="org.jboss.seam.ui.EnumConverter") public class EnumConverter implements javax.faces.convert.Converter { public Object getAsObject(FacesContext context, UIComponent comp, String value) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -4,7 +4,9 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; +@FacesConverter(value="org.jboss.sema.ui.NoSelectionConverter") public class NoSelectionConverter implements Converter { public static final String NO_SELECTION_VALUE = "org.jboss.seam.ui.NoSelectionConverter.noSelectionValue"; Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -7,11 +7,13 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.faces.convert.FacesConverter; /** * Helper class for ConverterChain * */ +@FacesConverter(value="org.jboss.sema.ui.PrioritizableConverter") public class PrioritizableConverter implements Converter, Comparable<PrioritizableConverter>, StateHolder { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -17,12 +17,14 @@ import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; /** * @author Pete Muir * @author sim * */ +@JsfRenderer(type="org.jboss.seam.ui.DefaultActionRenderer", family="org.jboss.seam.ui.DefaultActionRenderer") public class DefaultActionRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -16,7 +16,7 @@ import org.jboss.seam.web.MultipartRequest; import org.richfaces.cdk.annotations.JsfRenderer; -@JsfRenderer(type="org.jboss.seam.ui.renderkit.FileUploadRendererBase", family="org.jboss.seam.ui.FileUploadRenderer") +@JsfRenderer(type="org.jboss.seam.ui.FileUploadRenderer", family="org.jboss.seam.ui.FileUploadRenderer") public class FileUploadRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java 2012-05-16 20:46:26 UTC (rev 14699) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java 2012-05-16 20:47:45 UTC (rev 14700) @@ -11,7 +11,9 @@ import org.jboss.seam.ui.component.UIValidateAll; import org.jboss.seam.ui.util.cdk.RendererBase; import org.jboss.seam.ui.validator.ModelValidator; +import org.richfaces.cdk.annotations.JsfRenderer; +@JsfRenderer(type="org.jboss.seam.ui.ValidateAllRenderer", family="org.jboss.seam.ui.ValidateAllRenderer") public class ValidateAllRendererBase extends RendererBase { _______________________________________________ seam-commits mailing list seam-commits@lists.jboss.org https://lists.jboss.org/mailman/listinfo/seam-commits