[richfaces-svn-commits] JBoss Rich Faces SVN: r9484 - in trunk/test-applications/facelets/src/main: java/combobox and 6 other directories.

Author: mvitenkov Date: 2008-07-09 08:55:18 -0400 (Wed, 09 Jul 2008) New Revision: 9484 Added: trunk/test-applications/facelets/src/main/java/util/componentInfo/Info.java trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentInfo.xml Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java trunk/test-applications/facelets/src/main/java/combobox/Combobox.java trunk/test-applications/facelets/src/main/java/rich/Options.java trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml Log: +test Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-07-09 12:55:18 UTC (rev 9484) @@ -30,10 +30,14 @@ import java.util.TimeZone; import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; +import org.richfaces.component.html.HtmlCalendar; import org.richfaces.event.CurrentDateChangeEvent; +import util.componentInfo.ComponentInfo; + public class CalendarBean { private static final String [] WEEK_DAY_SHORT = new String[] { "<i>Sun</i>", @@ -86,6 +90,7 @@ private boolean showWeekDaysBar; private boolean showWeeksBar; private String todayControlMode; // scroll, select, hidden; + private HtmlCalendar htmlCalendar = null; public CalendarBean() { horizontalOffset = "0"; @@ -123,7 +128,11 @@ preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } - + public String add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlCalendar); + return null; + } public String getHorizontalOffset() { return horizontalOffset; @@ -410,6 +419,7 @@ } public void ddd(ValueChangeEvent event) { + System.out.println("=============inside valueChangeListener=============="); System.out.println(event.getOldValue()); System.out.println(event.getNewValue()); @@ -655,4 +665,14 @@ public void setHeaderFacet(String headerFacet) { this.headerFacet = headerFacet; } + + + public HtmlCalendar getHtmlCalendar() { + return htmlCalendar; + } + + + public void setHtmlCalendar(HtmlCalendar htmlCalendar) { + this.htmlCalendar = htmlCalendar; + } } Modified: trunk/test-applications/facelets/src/main/java/combobox/Combobox.java =================================================================== --- trunk/test-applications/facelets/src/main/java/combobox/Combobox.java 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/java/combobox/Combobox.java 2008-07-09 12:55:18 UTC (rev 9484) @@ -11,6 +11,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; +import util.componentInfo.ComponentInfo; import util.data.Data; import util.event.Event; @@ -53,6 +54,11 @@ public void setAlign(String align) { this.align = align; } + + public void add(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(myComboBox); + } public Combobox() { this.disabled = false; Modified: trunk/test-applications/facelets/src/main/java/rich/Options.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/Options.java 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/java/rich/Options.java 2008-07-09 12:55:18 UTC (rev 9484) @@ -1,59 +1,121 @@ package rich; public class Options { - private static String [] CALENDAR_EVENT = {"onbeforedomupdate", "onchanged", "oncollapse", "oncomplete", "oncurrentdateselect", "ondatemouseout", "ondatemouseover", "ondateselect", "ondateselected", "onexpand", "oninputblur", "oninputchange", "oninputclick", "oninputfocus", "oninputkeydown", "oninputkeypress", "oninputkeyup", "oninputselect", "ontimeselect", "ontimeselected"}; - private static String [] CALENDAR_STYLE = {"style", "styleClass", "inputStyle"}; - private static String [] COLUMNS_STYLE = {"footerClass", "headerClass", "styleClass", "style"}; - private static String [] COMBOBOX_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onfocus", "onitemselected", "onkeydown", "onkeypress", "onkeyup", "onlistcall", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect"}; - private static String [] COMBOBOX_STYLE = {"buttonClass", "buttonDisabledClass", "buttonDisabledStyle", "buttonInactiveClass", "buttonInactiveStyle", "buttonStyle", "inputClass", "inputDisabledClass", "inputDisabledStyle", "inputInactiveClass", "inputInactiveStyle", "itemClass", "inputStyle", "listClass", "listStyle"}; - private static String [] CONTEXTMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover"}; - private static String [] CONTEXTMENU_STYLE = {"disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "style", "styleClass"}; - private static String [] DATADEFINITIONLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass"}; - private static String [] DATAORDEREDLIST_STYLE = {"columnClasses", "rowClasses", "style", "styleClass", "footerClass", "headerClass"}; - private static String [] DATAFILTERSLIDER_EVENT = {"onbeforedomupdate", "onchange", "onclick", "oncomplete", "ondblclick", "onerror", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onslide", "onSlideSubmit"}; - private static String [] DATAFILTERSLIDER_STYLE = {"styleClass", "rangeStyleClass", "trailerStyleClass", "style", "fieldStyleClass", "trackStyleClass", "handleStyleClass"}; - private static String [] DATASCROLLER_EVENT = {"onbeforedomupdate", "onclick", "oncomplete", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; - private static String [] DATASCROLLER_STYLE = {"inactiveStyle", "inactiveStyleClass", "selectedStyle", "selectedStyleClass", "style", "styleClass", "tableStyle", "tableStyleClass"}; - private static String [] DATATABLE_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onRowClick", "onRowDblClick", "onRowMouseDown", "onRowMouseMove", "onRowMouseOut", "onRowMouseOver", "onRowMouseUp"}; - private static String [] DATATABLE_STYLE = {"captionClass", "rowClasses", "headerClass", "footerClass", "styleClass", "captionStyle", "columnClasses"}; - private static String [] DRAGANDDROP_EVENT = {"ondragenter", "ondragexit", "ondrop", "ondropend", "oncomplete", "onsubmit", "onbeforedomupdate", "oncomplete", "ondragend", "ondragstart", "onsubmit", "ondropout", "ondropover"}; - private static String [] DRAGANDDROP_STYLE = {"acceptClass", "rejectClass", "style", "styleClass"}; - private static String [] DROPDOWNMENU_EVENT = {"oncollapse", "onexpand", "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", "onmouseover", "onbeforedomupdate", "onclick", "oncomplete", "onmousedown", "onmouseup", "onselect"}; - private static String [] DROPDOWNMENU_STYLE = {"iconClass", "iconStyle", "selectClass", "selectStyle", "style", "disabledItemClass", "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", "selectItemStyle", "styleClass"}; - private static String [] GMAP_EVENT = {"onclick", "ondblclick", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup"}; - private static String [] GMAP_STYLE = {"style=", "styleClass"}; - private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur", "onchange", "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide"}; - private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass", "barStyle", "handleClass", "inputClass", "handleSelectedClass", "inputSize", "styleClass", "inputStyle", "tipStyle", "style", "tipClass"}; - - + private static String[] CALENDAR_EVENT = { "onbeforedomupdate", + "onchanged", "oncollapse", "oncomplete", "oncurrentdateselect", + "ondatemouseout", "ondatemouseover", "ondateselect", + "ondateselected", "onexpand", "oninputblur", "oninputchange", + "oninputclick", "oninputfocus", "oninputkeydown", + "oninputkeypress", "oninputkeyup", "oninputselect", "ontimeselect", + "ontimeselected" }; + private static String[] CALENDAR_STYLE = { "style", "styleClass", + "inputStyle" }; + private static String[] COLUMNS_STYLE = { "footerClass", "headerClass", + "styleClass", "style" }; + private static String[] COMBOBOX_EVENT = { "onblur", "onchange", "onclick", + "ondblclick", "onfocus", "onitemselected", "onkeydown", + "onkeypress", "onkeyup", "onlistcall", "onmousedown", + "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onselect" }; + private static String[] COMBOBOX_STYLE = { "buttonClass", + "buttonDisabledClass", "buttonDisabledStyle", + "buttonInactiveClass", "buttonInactiveStyle", "buttonStyle", + "inputClass", "inputDisabledClass", "inputDisabledStyle", + "inputInactiveClass", "inputInactiveStyle", "itemClass", + "inputStyle", "listClass", "listStyle" }; + private static String[] CONTEXTMENU_EVENT = { "oncollapse", "onexpand", + "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", + "onmouseover" }; + private static String[] CONTEXTMENU_STYLE = { "disabledItemClass", + "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", + "selectItemStyle", "style", "styleClass" }; + private static String[] DATADEFINITIONLIST_STYLE = { "columnClasses", + "rowClasses", "style", "styleClass" }; + private static String[] DATAORDEREDLIST_STYLE = { "columnClasses", + "rowClasses", "style", "styleClass", "footerClass", "headerClass" }; + private static String[] DATAFILTERSLIDER_EVENT = { "onbeforedomupdate", + "onchange", "onclick", "oncomplete", "ondblclick", "onerror", + "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", + "onmouseout", "onmouseover", "onmouseup", "onslide", + "onSlideSubmit" }; + private static String[] DATAFILTERSLIDER_STYLE = { "styleClass", + "rangeStyleClass", "trailerStyleClass", "style", "fieldStyleClass", + "trackStyleClass", "handleStyleClass" }; + private static String[] DATASCROLLER_EVENT = { "onbeforedomupdate", + "onclick", "oncomplete", "ondblclick", "onkeydown", "onkeypress", + "onkeyup", "onmousedown", "onmousemove", "onmouseout", + "onmouseover", "onmouseup" }; + private static String[] DATASCROLLER_STYLE = { "inactiveStyle", + "inactiveStyleClass", "selectedStyle", "selectedStyleClass", + "style", "styleClass", "tableStyle", "tableStyleClass" }; + private static String[] DATATABLE_EVENT = { "onclick", "ondblclick", + "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", + "onmouseout", "onmouseover", "onmouseup", "onRowClick", + "onRowDblClick", "onRowMouseDown", "onRowMouseMove", + "onRowMouseOut", "onRowMouseOver", "onRowMouseUp" }; + private static String[] DATATABLE_STYLE = { "captionClass", "rowClasses", + "headerClass", "footerClass", "styleClass", "captionStyle", + "columnClasses" }; + private static String[] DRAGANDDROP_EVENT = { "ondragenter", "ondragexit", + "ondrop", "ondropend", "oncomplete", "onsubmit", + "onbeforedomupdate", "oncomplete", "ondragend", "ondragstart", + "onsubmit", "ondropout", "ondropover" }; + private static String[] DRAGANDDROP_STYLE = { "acceptClass", "rejectClass", + "style", "styleClass" }; + private static String[] DROPDOWNMENU_EVENT = { "oncollapse", "onexpand", + "ongroupactivate", "onitemselect", "onmousemove", "onmouseout", + "onmouseover", "onbeforedomupdate", "onclick", "oncomplete", + "onmousedown", "onmouseup", "onselect" }; + private static String[] DROPDOWNMENU_STYLE = { "iconClass", "iconStyle", + "selectClass", "selectStyle", "style", "disabledItemClass", + "disabledItemStyle", "itemClass", "itemStyle", "selectItemClass", + "selectItemStyle", "styleClass" }; + private static String[] GMAP_EVENT = { "onclick", "ondblclick", + "onkeydown", "onkeypress", "onkeyup", "onmousedown", "onmousemove", + "onmouseout", "onmouseover", "onmouseup" }; + private static String[] GMAP_STYLE = { "style=", "styleClass" }; + private static String[] INPUTNUMBERSLIDER_EVENT = { "onblur", "onchange", + "onclick", "ondblclick", "onerror", "onfocus", "onkeydown", + "onkeypress", "onkeyup", "onmousedown", "onmousemove", + "onmouseout", "onmouseover", "onmouseup", "onselect", "onslide" }; + private static String[] INPUTNUMBERSLIDER_STYLE = { "barClass", "barStyle", + "handleClass", "inputClass", "handleSelectedClass", "inputSize", + "styleClass", "inputStyle", "tipStyle", "style", "tipClass" }; + private boolean reDefault; private boolean reComponent; private boolean reProperty; private boolean reStraightforward; - + private boolean attribute; + public Options() { - + reDefault = true; reComponent = true; reProperty = true; reStraightforward = true; + attribute = false; } - + public boolean isReComponent() { return reComponent; } + public void setReComponent(boolean reComponent) { this.reComponent = reComponent; } + public boolean isReProperty() { return reProperty; } + public void setReProperty(boolean reProperty) { this.reProperty = reProperty; } + public boolean isReStraightforward() { return reStraightforward; } + public void setReStraightforward(boolean reStraightforward) { this.reStraightforward = reStraightforward; } @@ -65,4 +127,11 @@ public void setReDefault(boolean reDefault) { this.reDefault = reDefault; } + public boolean isAttribute() { + return attribute; + } + + public void setAttribute(boolean attribute) { + this.attribute = attribute; + } } Modified: trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-09 12:55:18 UTC (rev 9484) @@ -33,7 +33,13 @@ protected ComponentInfo() { } - + + public String getName() { + if (component == null) + return null; + return component.getClass().getName(); + } + public void setComponentInfo(String attribute, String property) { this.attribute = attribute; this.property = property; @@ -170,4 +176,12 @@ public void setComponent(Object component) { this.component = component; } + + public ComponentAttribute getComponentAttribute() { + return componentAttribute; + } + + public void setComponentAttribute(ComponentAttribute componentAttribute) { + this.componentAttribute = componentAttribute; + } } Added: trunk/test-applications/facelets/src/main/java/util/componentInfo/Info.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/componentInfo/Info.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/util/componentInfo/Info.java 2008-07-09 12:55:18 UTC (rev 9484) @@ -0,0 +1,119 @@ +/** + * + */ +package util.componentInfo; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; + +import javax.faces.component.html.HtmlInputText; +import javax.faces.component.html.HtmlOutputText; +import javax.faces.component.html.HtmlPanelGrid; +import javax.faces.context.FacesContext; + +/** + * @author user + * + */ +public class Info { + private ComponentInfo info = ComponentInfo.getInstance(); + private ComponentAttribute componentAttribute = info.getComponentAttribute();; + private HtmlPanelGrid panelEvent = null; + + public HtmlPanelGrid getPanelEvent() { + return panelEvent; + } + + public void setPanelEvent(HtmlPanelGrid panelEvent) { + this.panelEvent = panelEvent; + } + + public Info() { + } + + public String getName() { + return info.getName(); + } + + public List<Pair> getAttribute(){ + List<Pair> list = new ArrayList<Pair>(); + Set<Entry<String, String>> set = componentAttribute.getAttributeEntry(); + Iterator<Map.Entry<String, String>> iterator = set.iterator(); + while (iterator.hasNext()) { + Map.Entry<String, String> entry = iterator.next(); + String str = Character.toUpperCase(entry.getKey().charAt(0)) + entry.getKey().substring(1); +// Object obj = null; +// if(entry.getValue().equals("boolean")) +// obj = info.invoke("is" + str, new Class[]{}, new Object[]{}); +// else obj = info.invoke("get" + str, new Class[]{}, new Object[]{}); + list.add(new Pair(entry.getKey(), entry.getValue())); + } + return list; + } + + public List<Pair> getEvent(){ + FacesContext context = FacesContext.getCurrentInstance(); + List<Pair> list = new ArrayList<Pair>(); + Set<Entry<String, String>> set = componentAttribute.getEventEntry(); + Iterator<Map.Entry<String, String>> iterator = set.iterator(); + panelEvent.getChildren().clear(); + while (iterator.hasNext()) { + Map.Entry<String, String> entry = iterator.next(); + String key = entry.getKey(); + + HtmlOutputText out = new HtmlOutputText(); + out.setValue(key); + panelEvent.getChildren().add(out); + + HtmlInputText input = new HtmlInputText(); + input.setValue("don't work"); + input.setStyle("color:red"); + input.setId(key + "InputID"); + panelEvent.getChildren().add(input); + + list.add(new Pair(key,"showEvent('" + input.getClientId(context) + "', '" + key + "work!')")); + } + return list; + } + + public List<Pair> getStyle(){ + List<Pair> list = new ArrayList<Pair>(); + Set<Entry<String, String>> set = componentAttribute.getStyleEntry(); + Iterator<Map.Entry<String, String>> iterator = set.iterator(); + while (iterator.hasNext()) { + Map.Entry<String, String> entry = iterator.next(); + list.add(new Pair(entry.getKey(), entry.getValue())); + } + return list; + } + + public class Pair { + private String key; + private String value; + + public Pair(String key, String value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } +} Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-07-09 12:55:18 UTC (rev 9484) @@ -65,7 +65,8 @@ oninputkeyup="#{event.oninputkeyup}" oninputselect="#{event.oninputselect}" ontimeselect="#{event.ontimeselect}" - ontimeselected="#{event.ontimeselected}"> + ontimeselected="#{event.ontimeselected}" + binding="#{calendarBean.htmlCalendar}"> <f:facet name="weekDay"> <f:verbatim> <span style="padding: 2px; font-size: 4">{weekDayLabel + Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-07-09 12:55:18 UTC (rev 9484) @@ -4,7 +4,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="calendarPropertySubviewID"> - + <h:commandButton action="#{calendarBean.add}" value="add test" /> <h:panelGrid columns="2"> <h:panelGroup> <a4j:commandButton value="reRender" @@ -236,16 +236,5 @@ <a4j:commandLink onclick="alert($('formID:calendarSubviewID:calendarClientID').component.getCurrentYear())" value="getCurrentYear"></a4j:commandLink> - </h:panelGrid> - <br /> - <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getValue" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('calendarClientID').value}" /> - </rich:column> - </h:panelGrid> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-07-09 12:55:18 UTC (rev 9484) @@ -8,6 +8,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxPropertySubviewID"> + <h:commandButton action="#{combobox.add}" value="add test" /> <h:panelGrid columns="2"> <h:outputText value="defaultLabel"></h:outputText> <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> @@ -82,15 +83,5 @@ <a4j:commandLink onclick="$('formID:comboboxSubviewID:comboboxID').component.disable()" value="disable"></a4j:commandLink> - <br /> - <br /> - <div style="FONT-WEIGHT: bold;">rich:findComponent</div> - <h:panelGrid columns="2"> - <rich:column> - <a4j:commandLink value="getValue" reRender="findID"></a4j:commandLink> - </rich:column> - <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('comboboxID').value}" /> - </rich:column> - </h:panelGrid> + </f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentInfo.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentInfo.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ComponentInfo.xml 2008-07-09 12:55:18 UTC (rev 9484) @@ -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>info</managed-bean-name> + <managed-bean-class>util.componentInfo.Info</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-07-09 12:55:18 UTC (rev 9484) @@ -41,7 +41,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,! /WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.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,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces! -config-Custom.xml</param-value> + <param-value>/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml! ,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.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,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/! faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml</param-valu e> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> Modified: trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-07-09 11:40:30 UTC (rev 9483) +++ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-07-09 12:55:18 UTC (rev 9484) @@ -1,6 +1,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:a4j="http://richfaces.org/a4j" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> <f:view> <head> <f:loadBundle basename="message" var="msg" /> @@ -18,42 +22,51 @@ oldObject.parentNode.replaceChild(newObject,oldObject); } </script> - <link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> </head> <body> - <h:form id="formID"> - <div id="divOpthID" align="right" style="z-index: 200"> - <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> - </div> - <h:messages showDetail="true" showSummary="true"></h:messages> - + <h:form id="formID"> + <div id="divOpthID" align="right" style="z-index: 200"><ui:include + src="/pages/RichMenu/RichMenu.xhtml" /></div> + <h:messages showDetail="true" showSummary="true"></h:messages> + <h:panelGrid id="richGridID" columns="1" width="100%"> - <h:column rendered="#{option.reComponent}"> - <ui:include src="${richBean.pathComponent}"/> - </h:column> - - <h:column rendered="#{option.reStraightforward}"> - <ui:include src="${richBean.pathStraightforward}"/> - </h:column> + <h:column rendered="#{option.reComponent}"> + <ui:include src="${richBean.pathComponent}" /> + </h:column> - <h:column rendered="#{option.reProperty}"> - <ui:include src="${richBean.pathProperty}"/> - </h:column> - </h:panelGrid> + <h:column rendered="#{option.reStraightforward}"> + <ui:include src="${richBean.pathStraightforward}" /> + </h:column> - <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" minWidth="200" moveable="true" style="overflow: true;"> - <f:facet name="header"> - <h:outputText value="Events ..."/> - </f:facet> - <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> - </f:facet> + <h:column rendered="#{option.reProperty}"> + <ui:include src="${richBean.pathProperty}" /> + </h:column> - <ui:include src="/pages/Action/EventInfo.xhtml"/> + </h:panelGrid> + + <h:form id="infoFormID"> + <ui:include src="/pages/Info/Info.xhtml" /> + </h:form> - </rich:modalPanel> - <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> - </h:form> + <rich:modalPanel id="eventInfoID" autosized="true" minHeight="550" + minWidth="200" moveable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" + onclick="Richfaces.hideModalPanel('eventInfoID');" /> + </f:facet> + + <ui:include src="/pages/Action/EventInfo.xhtml" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" + onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> + </h:form> </body> </f:view> </html>