[richfaces-svn-commits] JBoss Rich Faces SVN: r4514 - in branches/3.1.x/test-applications/facelets/src/main: java/componentControl and 11 other directories.

Author: ayanul Date: 2007-12-05 15:18:32 -0500 (Wed, 05 Dec 2007) New Revision: 4514 Added: branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml Log: update componentControl, ModalPanel Added: branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/componentControl/ComponentControl.java 2007-12-05 20:18:32 UTC (rev 4514) @@ -0,0 +1,17 @@ +package componentControl; + +public class ComponentControl { + private boolean calendarPopup; + + public ComponentControl() { + calendarPopup = false; + } + + public boolean isCalendarPopup() { + return calendarPopup; + } + + public void setCalendarPopup(boolean calendarPopup) { + this.calendarPopup = calendarPopup; + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2007-12-05 20:18:32 UTC (rev 4514) @@ -7,13 +7,13 @@ private boolean keepVisualState; private String left; private String top; - private String rendered; + private boolean rendered; private boolean required; private String requiredMessage; private int shadowDepth; private int shadowOpacity; private boolean showWhenRendered; - private int zindex; + private String zindex; private int minHeight; private int minWidth; @@ -25,15 +25,25 @@ public ModalPanel() { - minHeight = 100; - minWidth = 100; - height = 300; - width = 300; + this.minHeight = 100; + this.minWidth = 100; + this.height = 300; + this.width = 300; - moveable=true; - resizeable=true; - - + this.moveable=true; + this.resizeable=true; + this.autosized = false; + this.immediate = false; + this.keepVisualState = false; + this.left = "100"; + this.top = "100"; + this.rendered = true; + this.required = true; + this.requiredMessage = "requiredMessage"; + this.shadowDepth = 3; + this.shadowOpacity = 3; + this.zindex = "3"; + this.showWhenRendered = false; } public int getHeight() { @@ -169,11 +179,11 @@ this.top = top; } - public String getRendered() { + public boolean getRendered() { return rendered; } - public void setRendered(String rendered) { + public void setRendered(boolean rendered) { this.rendered = rendered; } @@ -217,11 +227,11 @@ this.showWhenRendered = showWhenRendered; } - public int getZindex() { + public String getZindex() { return zindex; } - public void setZindex(int zindex) { + public void setZindex(String zindex) { this.zindex = zindex; } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-05 20:18:32 UTC (rev 4514) @@ -48,7 +48,7 @@ map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false})); map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true})); map.add("Tree", add("/Tree/Tree", new boolean [] {true, false})); - map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true})); + map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, false})); map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {true, true})); @@ -56,6 +56,7 @@ map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {true, false})); map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false})); map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); + map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); } public String getSrc() { Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -18,7 +18,7 @@ showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}" focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message" timeZone="#{calendarBean.tmZone}"> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ComponentControl/ComponentControl.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -2,47 +2,89 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> <h:form> <rich:modalPanel id="ccModalPanelID" onshow="alert(event.parameters.show)" onhide="alert(event.parameters.hide)"> - <h:outputLink id="hideButton1ID" onclick="return false;" value="Close" ><f:verbatim>Close 1</f:verbatim></h:outputLink> - <f:verbatim><br/></f:verbatim> - <h:outputLink id="hideButton2ID" onclick="return false;" value="Close" ><f:verbatim>Close 2</f:verbatim></h:outputLink> + <h:outputLink id="hideButton1ID" onclick="return false;" value="Close"> + <f:verbatim>Close 1</f:verbatim> + </h:outputLink> + <f:verbatim> + <br /> + </f:verbatim> + <h:outputLink id="hideButton2ID" onclick="return false;" value="Close"> + <f:verbatim>Close 2</f:verbatim> + </h:outputLink> </rich:modalPanel> - <h:commandButton id="showButtonID" value="show" > + <h:commandButton id="showButtonID" onclick="return false;" value="show ModalPanel"> <rich:componentControl for="ccModalPanelID" event="onclick" operation="show" params="show:'componentControl work(show)'" /> </h:commandButton> - <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" params="hide:'componentControl work(hide)'" /> + + <rich:componentControl attachTo="hideButton1ID, hideButton2ID" event="onclick" for="ccModalPanelID" operation="hide" + params="hide:'componentControl work(hide)'" /> - <f:verbatim><br/><br/></f:verbatim> - - <rich:panelMenu id="ccPanelMenuID" mode="client"> - <rich:panelMenuGroup label="group1"> - <rich:panelMenuGroup label="group1 1"> - <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem> + <ui:remove> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:panelMenu id="ccPanelMenuID" mode="client"> + <rich:panelMenuGroup label="group1"> + <rich:panelMenuGroup label="group1 1"> + <rich:panelMenuItem label="Item 1 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1 2"></rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> - <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenu> + </rich:panelMenu> + + <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse" /> + + <a href="#" id="testPMID" onclick="return false;">Click text</a> + </ui:remove> - <rich:componentControl attachTo="testPMID" for="ccPanelMenuID" event="onclick" operation="doCollapse"/> - - <a href="#" id="testPMID" onclick="return false;">Click text</a> - <f:verbatim><br/><br/></f:verbatim> - - <rich:componentControl attachTo="testCID" for="cc" event="onclick" operation="doExpand" params="show:'componentControl work(show)'"/> - <rich:calendar popup="true" id="cc"/> + <f:verbatim> + <br /> + <br /> + </f:verbatim> - - <a href="#" id="testCID">Click text</a> - <f:verbatim><br/><br/></f:verbatim> - <a onclick="$('componentControlSubviewID:_id0:cc').component.doExpand()" href="#">Show</a> - - <rich:panelMenu id="ccPanelMenu"> - <h:outputText value="click text" /> + <rich:calendar popup="#{componentControl.calendarPopup}" id="ccCalendarID" /> + <h:panelGrid columns="2"> + <h:outputText value="popup calendar" /> + <h:selectBooleanCheckbox id="calendarSelectID" value="#{componentControl.calendarPopup}" onchange="submit();" /> + </h:panelGrid> + + <f:verbatim> + <br /> + <a href="#" id="doExpandCalendarID">Calendar (doExpand)</a> + <br /> + <a href="#" id="doNextYearCalendarID">Calendar (nextYear)</a> + <br /> + <a href="#" id="doPrevYearCalendarID">Calendar (prevYear)</a> + <br /> + <a href="#" id="doNextMonthCalendarID">Calendar (nextMonth)</a> + <br /> + <a href="#" id="doPrevMonthCalendarID">Calendar (prevMonth)</a> + <br /> + <a href="#" id="doTodayCalendarID">Calendar (today)</a> + </f:verbatim> + + <rich:componentControl attachTo="doExpandCalendarID" for="ccCalendarID" event="onclick" operation="doExpand" /> + <rich:componentControl attachTo="doNextYearCalendarID" for="ccCalendarID" event="onclick" operation="nextYear" /> + <rich:componentControl attachTo="doPrevYearCalendarID" for="ccCalendarID" event="onclick" operation="prevYear" /> + <rich:componentControl attachTo="doNextMonthCalendarID" for="ccCalendarID" event="onclick" operation="nextMonth" /> + <rich:componentControl attachTo="doPrevMonthCalendarID" for="ccCalendarID" event="onclick" operation="prevMonth" /> + <rich:componentControl attachTo="doTodayCalendarID" for="ccCalendarID" event="onclick" operation="today" /> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:panelMenu id="ccContextMenuPanelMenuID"> + <h:outputText value="click text" /> </rich:panelMenu> - - <rich:contextMenu id="ccContextMenu" submitMode="ajax"> + + <rich:contextMenu id="ccContextMenuID" submitMode="ajax"> <rich:menuItem icon="/pics/header.png" value="tab1" reRender="cmInfoID"> <f:param name="cmdParam" value="menu" /> </rich:menuItem> @@ -57,6 +99,6 @@ <f:param name="cmdParam" value="c" /> </rich:menuItem> </rich:contextMenu> - <rich:componentControl event="oncontextmenu" attachTo="ccPanelMenu" for="ccContextMenu" operation="doShow"/> + <rich:componentControl event="oncontextmenu" attachTo="ccContextMenuPanelMenuID" for="ccContextMenuID" operation="doShow" /> </h:form> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/DragAndDrop/DragAndDrop.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -186,7 +186,7 @@ <f:verbatim>dragSupport</f:verbatim> </h:panelGrid> - <a4j:status startText="...request..." stopText="stop" /> + <a4j:status id="adf" startText="...request..." stopText="stop" /> <a4j:outputPanel ajaxRendered="true"> <h:messages /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -5,8 +5,8 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="" - ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')" + <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -13,6 +13,7 @@ listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}" targetCaptionLabel="#{listShuttle.targetCaptionLabel}" topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}"> + <h:column width="100px"> <f:facet name="header"> <h:outputText value="Number" /> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -21,5 +21,17 @@ </rich:modalPanel> <a onclick="Richfaces.showModalPanel('MPid');" href="#">Show MP</a> + + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('MPid');" /> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> + </f:subview> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -6,6 +6,53 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> <h:panelGrid columns="2"> + <h:outputText value="shadowDepth" /> + <h:inputText value="#{modalPanel.shadowDepth}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:inputText> + + <h:outputText value="shadowOpacity" /> + <h:inputText value="#{modalPanel.shadowOpacity}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:inputText> + + <h:outputText value="keepVisualState" /> + <h:selectBooleanCheckbox value="#{modalPanel.keepVisualState}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="left" /> + <h:inputText value="#{modalPanel.left}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:inputText> + + <h:outputText value="top" /> + <h:inputText value="#{modalPanel.top}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:inputText> + + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{modalPanel.rendered}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="showWhenRendered" /> + <h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}" > + <a4j:support event="onchange" action="suport();"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="zindex" /> + <h:selectOneRadio value="#{modalPanel.zindex}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="3" /> + <a4j:support event="onchange" action="suport();"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="autosized" /> + <h:selectBooleanCheckbox value="#{modalPanel.autosized}" > + <a4j:support event="onchange" action="suport();"></a4j:support> + </h:selectBooleanCheckbox> + <h:outputText value="Width:" /> <h:inputText value="#{modalPanel.width}"> <a4j:support event="onchange" reRender="MPid"></a4j:support> @@ -35,6 +82,21 @@ <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> <a4j:support event="onclick" reRender="MPid"></a4j:support> </h:selectBooleanCheckbox> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{modalPanel.immediate}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="required" /> + <h:selectBooleanCheckbox value="#{modalPanel.required}" > + <a4j:support event="onchange" action="suport();"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage" /> + <h:inputText value="#{modalPanel.requiredMessage}" > + <a4j:support event="onchange" action="submit();"></a4j:support> + </h:inputText> </h:panelGrid> </rich:simpleTogglePanel> </f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -6,7 +6,7 @@ mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" - onLoadMap="print('onLoadMapInputID', 'onLoadMap work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> Added: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentControl.xml 2007-12-05 20:18:32 UTC (rev 4514) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>componentControl</managed-bean-name> + <managed-bean-class>componentControl.ComponentControl</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-05 20:18:32 UTC (rev 4514) @@ -46,7 +46,7 @@ /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, - /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml</param-value> + /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-12-05 18:56:15 UTC (rev 4513) +++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-12-05 20:18:32 UTC (rev 4514) @@ -30,6 +30,7 @@ <h:outputText value="Select component:" /> <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> <f:selectItem itemValue="Blank" itemLabel="Blank" /> + <f:selectItem itemValue="ComponentControl" itemLabel="ComponentControl" /> <f:selectItem itemValue="OrderingList" itemLabel="OrderingList" /> <f:selectItem itemValue="ListShuttle" itemLabel="ListShuttle" /> <f:selectItem itemValue="ContextMenu" itemLabel="ContextMenu" />