Author: nbelaevski Date: 2009-11-19 21:34:09 -0500 (Thu, 19 Nov 2009) New Revision: 15936 Added: root/ui/trunk/components/core/src/main/config/faces-config.xml root/ui/trunk/components/core/src/main/old_configs/ root/ui/trunk/components/core/src/main/old_configs/component/ root/ui/trunk/components/core/src/main/old_configs/resources/ root/ui/trunk/components/core/src/main/old_configs/taglib/ root/ui/trunk/components/core/src/main/resources/META-INF/push-managed-beans.faces-config.xml Removed: root/ui/trunk/components/core/src/main/config/component/ root/ui/trunk/components/core/src/main/config/resources/ root/ui/trunk/components/core/src/main/config/taglib/ root/ui/trunk/components/core/src/main/resources/META-INF/faces-config.xml Modified: root/ui/trunk/components/core/pom.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml Log: https://jira.jboss.org/jira/browse/RF-7732 - updates for ui/* projects Modified: root/ui/trunk/components/core/pom.xml =================================================================== --- root/ui/trunk/components/core/pom.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/pom.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -28,6 +28,15 @@ </taglib> </library> </configuration> + <executions> + <execution> + <id>cdk-generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> </plugin> </plugins> Added: root/ui/trunk/components/core/src/main/config/faces-config.xml =================================================================== --- root/ui/trunk/components/core/src/main/config/faces-config.xml (rev 0) +++ root/ui/trunk/components/core/src/main/config/faces-config.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -0,0 +1,93 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <component> + <component-type>org.richfaces.Push</component-type> + <component-class>org.richfaces.component.html.HtmlPush</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.Function</component-type> + <component-class>org.richfaces.component.html.HtmlAjaxFunction</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.MediaOutput</component-type> + <component-class>org.richfaces.component.html.HtmlMediaOutput</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.OutputPanel</component-type> + <component-class>org.richfaces.component.html.HtmlOutputPanel</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.Status</component-type> + <component-class>org.richfaces.component.html.HtmlAjaxStatus</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.AjaxLog</component-type> + <component-class>org.richfaces.component.html.HtmlAjaxLog</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.CommandLink</component-type> + <component-class>org.richfaces.component.html.HtmlCommandLink</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.CommandButton</component-type> + <component-class>org.richfaces.component.html.HtmlCommandButton</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> + <renderer> + <component-family>org.richfaces.Push</component-family> + <renderer-type>org.richfaces.PushRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.AjaxPushRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.MediaOutput</component-family> + <renderer-type>org.richfaces.MediaOutputRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.MediaOutputRenderer</renderer-class> + </renderer> + <renderer> + <component-family>javax.faces.Panel</component-family> + <renderer-type>org.richfaces.OutputPanelRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.AjaxOutputPanelRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Status</component-family> + <renderer-type>org.richfaces.StatusRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.html.AjaxStatusRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> \ No newline at end of file Copied: root/ui/trunk/components/core/src/main/old_configs/component (from rev 15927, root/ui/trunk/components/core/src/main/config/component) Copied: root/ui/trunk/components/core/src/main/old_configs/resources (from rev 15927, root/ui/trunk/components/core/src/main/config/resources) Copied: root/ui/trunk/components/core/src/main/old_configs/taglib (from rev 15927, root/ui/trunk/components/core/src/main/config/taglib) Deleted: root/ui/trunk/components/core/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/faces-config.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/src/main/resources/META-INF/faces-config.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -1,95 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - version="2.0"> - - <managed-bean eager="true"> - <managed-bean-name>richFacesPushListenersManager</managed-bean-name> - <managed-bean-class>org.richfaces.component.PushListenersManager</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - - <component> - <component-type>org.richfaces.Push</component-type> - <component-class>org.richfaces.component.html.HtmlPush</component-class> - </component> - - <component> - <component-type>org.richfaces.Function</component-type> - <component-class>org.richfaces.component.html.HtmlAjaxFunction</component-class> - </component> - - <component> - <component-type>org.richfaces.MediaOutput</component-type> - <component-class>org.richfaces.component.html.HtmlMediaOutput</component-class> - </component> - - <component> - <component-type>org.richfaces.OutputPanel</component-type> - <component-class>org.richfaces.component.html.HtmlOutputPanel</component-class> - </component> - - <component> - <component-type>org.richfaces.Status</component-type> - <component-class>org.richfaces.component.html.HtmlAjaxStatus</component-class> - </component> - - <component> - <component-type>org.richfaces.AjaxLog</component-type> - <component-class>org.richfaces.component.html.HtmlAjaxLog</component-class> - </component> - - <component> - <component-type>org.richfaces.CommandLink</component-type> - <component-class>org.richfaces.component.html.HtmlCommandLink</component-class> - </component> - - <component> - <component-type>org.richfaces.CommandButton</component-type> - <component-class>org.richfaces.component.html.HtmlCommandButton</component-class> - </component> - - <render-kit> - <render-kit-id>HTML_BASIC</render-kit-id> - <renderer> - <component-family>org.richfaces.Push</component-family> - <renderer-type>org.richfaces.PushRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AjaxPushRenderer</renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Command</component-family> - <renderer-type>org.richfaces.FunctionRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AjaxFunctionRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.MediaOutput</component-family> - <renderer-type>org.richfaces.MediaOutputRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.MediaOutputRenderer</renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Panel</component-family> - <renderer-type>org.richfaces.OutputPanelRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AjaxOutputPanelRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.Status</component-family> - <renderer-type>org.richfaces.StatusRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AjaxStatusRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.AjaxLog</component-family> - <renderer-type>org.richfaces.AjaxLogRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AjaxLogRenderer</renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Command</component-family> - <renderer-type>org.richfaces.CommandLinkRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.CommandLinkRenderer</renderer-class> - </renderer> - <renderer> - <component-family>javax.faces.Command</component-family> - <renderer-type>org.richfaces.CommandButtonRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.CommandButtonRenderer</renderer-class> - </renderer> - </render-kit> -</faces-config> \ No newline at end of file Copied: root/ui/trunk/components/core/src/main/resources/META-INF/push-managed-beans.faces-config.xml (from rev 15927, root/ui/trunk/components/core/src/main/resources/META-INF/faces-config.xml) =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/push-managed-beans.faces-config.xml (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/push-managed-beans.faces-config.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <managed-bean eager="true"> + <managed-bean-name>richFacesPushListenersManager</managed-bean-name> + <managed-bean-class>org.richfaces.component.PushListenersManager</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + +</faces-config> \ No newline at end of file Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - class="org.richfaces.renderkit.html.CommandButtonRenderer" - superclass="org.richfaces.renderkit.html.AjaxCommandButtonRendererBase" - componentclass="javax.faces.component.UIComponent"> + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> - <!-- f:clientid var="clientId"/ --> + <cc:interface> + <cdk:class>org.richfaces.renderkit.html.CommandButtonRenderer</cdk:class> + <cdk:superclass>org.richfaces.renderkit.html.AjaxCommandButtonRendererBase</cdk:superclass> + <cdk:component-family>javax.faces.Command</cdk:component-family> + <cdk:renderer-type>org.richfaces.CommandButtonRenderer + </cdk:renderer-type> + </cc:interface> - <input - id="#{clientId}" - name="#{clientId}" - cdk:passThroughWithExclusions="name onclick type id class" - onclick="#{this.getOnClick(context,component)}" - value="#{component.attributes['value']}" - class="#{component.attributes['styleClass']}" - > - <cdk:call expression="encodeTypeAndImage(context,component);" /> - </input> - + <cc:implementation> + <input id="#{clientId}" name="#{clientId}" + cdk:passThroughWithExclusions="name onclick type id class" onclick="#{this.getOnClick(facesContext,cc)}" + value="#{cc.attributes['value']}" class="#{cc.attributes['styleClass']}"> + <cdk:call expression="encodeTypeAndImage(facesContext,cc);" /> + </input> + </cc:implementation> </cdk:root> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> + <cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - class="org.richfaces.renderkit.html.AjaxFunctionRenderer" - superclass="org.richfaces.renderkit.AjaxFunctionRendererBase" - componentclass="javax.faces.component.UIComponent"> + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:cc="http://java.sun.com/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee"> - <!-- f:clientid var="clientId"/ --> - <span id="#{clientId}" style="display: none;"> - <script type="text/javascript"> - #{this.getFunction(context,component)}; - </script> - </span> + <cc:interface> + <cdk:class>org.richfaces.renderkit.html.AjaxFunctionRenderer</cdk:class> + <cdk:superclass>org.richfaces.renderkit.AjaxFunctionRendererBase</cdk:superclass> + <cdk:component-family>javax.faces.Command</cdk:component-family> + <cdk:renderer-type>org.richfaces.FunctionRenderer</cdk:renderer-type> + </cc:interface> + + <cc:implementation> + <span id="#{clientId}" style="display: none;"> + <script type="text/javascript"> + #{this.getFunction(facesContext, cc)}; + </script> + </span> + </cc:implementation> </cdk:root> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - class="org.richfaces.renderkit.html.CommandLinkRenderer" - superclass="org.richfaces.renderkit.AjaxCommandRendererBase" - componentclass="javax.faces.component.UIComponent"> + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> - <!-- f:clientid var="clientId"/ --> - <a - id="#{clientId}" - name="#{clientId}" - cdk:passThroughWithExclusions="value name onclick href id" - onclick="#{this.getOnClick(context,component)}" - href="#" - class="#{component.attributes['styleClass']}" - > - #{component.attributes['value']} - <cdk:body> - <cdk:call expression="renderChildren(context,component);" /> - </cdk:body> - </a> -</cdk:root> \ No newline at end of file + <cc:interface> + <cdk:class>org.richfaces.renderkit.html.CommandLinkRenderer</cdk:class> + <cdk:superclass>org.richfaces.renderkit.AjaxCommandRendererBase</cdk:superclass> + <cdk:component-family>javax.faces.Command</cdk:component-family> + <cdk:renderer-type>org.richfaces.CommandLinkRenderer</cdk:renderer-type> + </cc:interface> + + <cc:implementation> + <a id="#{clientId}" name="#{clientId}" + cdk:passThroughWithExclusions="value name onclick href id" onclick="#{this.getOnClick(facesContext, cc)}" + href="#" class="#{cc.attributes['styleClass']}"> + #{cc.attributes['value']} + <cdk:body> + <cdk:call expression="renderChildren(facesContext, cc);" /> + </cdk:body> + </a> + </cc:implementation> + +</cdk:root> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-11-20 02:29:35 UTC (rev 15935) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-11-20 02:34:09 UTC (rev 15936) @@ -1,38 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> <cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - class="org.richfaces.renderkit.html.AjaxLogRenderer" - superclass="org.ajax4jsf.renderkit.RendererBase" - componentclass="org.richfaces.component.UIAjaxLog"> + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> - <!-- f:clientid var="clientId"/ > - <cdk:choose> - <cdk:when test="#{component.isPopup()}"> - <script id="#{clientId}" type="text/javascript"> - LOG.registerPopup( - '#{component.attributes["hotkey"]}', - '#{component.attributes["name"]}', - #{component.attributes["width"]}, - #{component.attributes["height"]}, - LOG.#{component.attributes["level"]}); - </script> - </cdk:when> - <cdk:otherwise> - <div id="richfaces.log" + <cc:interface> + <cdk:class>org.richfaces.renderkit.html.AjaxLogRenderer</cdk:class> + <cdk:superclass>org.ajax4jsf.renderkit.RendererBase</cdk:superclass> + <cdk:component-family>org.richfaces.AjaxLog</cdk:component-family> + <cdk:renderer-type>org.richfaces.AjaxLogRenderer</cdk:renderer-type> + </cc:interface> + + <cc:implementation> + <!-- + f:clientid var="clientId"/ > <cdk:choose> <cdk:when + test="#{component.isPopup()}"> <script id="#{clientId}" + type="text/javascript"> LOG.registerPopup( + '#{component.attributes["hotkey"]}', + '#{component.attributes["name"]}', #{component.attributes["width"]}, + #{component.attributes["height"]}, + LOG.#{component.attributes["level"]}); </script> </cdk:when> + <cdk:otherwise> <div id="richfaces.log" style='width:#{component.attributes["width"]};height:#{component.attributes["height"]};overflow:auto;#{component.attributes["style"]}' cdk:passThroughWithExclusions="value name id style"> - <button>Clear</button><br /> - <script type="text/javascript"> - LOG.LEVEL = LOG.#{component.attributes["level"]}; - </script> - </div> - </cdk:otherwise> - </cdk:choose--> - <div id="richfaces.log" class="rich-log #{component.attributes['styleClass']}" - cdk:passThroughWithExclusions="id class"> - <script type="text/javascript"> - RichFaces.log.setLevel("#{component.attributes['level']}"); + <button>Clear</button><br /> <script type="text/javascript"> + LOG.LEVEL = LOG.#{component.attributes["level"]}; </script> </div> + </cdk:otherwise> </cdk:choose + --> + <div id="richfaces.log" class="rich-log #{cc.attributes['styleClass']}" + cdk:passThroughWithExclusions="id class"> + <script type="text/javascript"> + RichFaces.log.setLevel("#{cc.attributes['level']}"); </script> - </div> + </div> + </cc:implementation> </cdk:root>