Author: ayanul Date: 2008-03-11 09:27:33 -0400 (Tue, 11 Mar 2008) New Revision: 6686 Added: trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttleConverter.java trunk/test-applications/jsp/src/main/java/orderingList/OrderingListConverter.java trunk/test-applications/jsp/src/main/java/skinning/ trunk/test-applications/jsp/src/main/java/skinning/Skinning.java trunk/test-applications/jsp/src/main/webapp/Skinning/ trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skinning.xml Modified: trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java trunk/test-applications/jsp/src/main/java/util/style/Style.java trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp trunk/test-applications/jsp/src/main/webapp/pages/main.jsp Log: + update FileUpload + update Combobox + add skinning Modified: trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/dfs/DemoSliderBean.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -33,6 +33,14 @@ private DemoInventoryList demoInventoryList; private String action; private String actionListener; + private String onslide; + private String onchange; + private boolean storeResults; + private Integer startRange; + private Integer endRange; + private Integer increment; + private String trailer; + private Integer handleValue; public DemoSliderBean() { rendered = true; Modified: trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java =================================================================== --- trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/fileUpload/FileUpload.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -3,10 +3,9 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; +import java.util.ArrayList; + import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem; @@ -15,17 +14,20 @@ private boolean autoclear; private boolean rendered; private boolean required; + private String acceptedTypes; private String requiredMessage; private String listHeight; private String listWidth; - private Map<String, InputStream> data = new HashMap<String, InputStream>(); + private ArrayList data; private Integer maxFilesQuantity; public FileUpload() { + data = new ArrayList(); disabled = false; autoclear = false; rendered = true; required = false; + acceptedTypes = "*"; requiredMessage = "requiredMessage"; listHeight = "200px"; listWidth = "150px"; @@ -40,7 +42,6 @@ ByteArrayOutputStream b = new ByteArrayOutputStream(); b.write(upload.getData()); } - } public boolean isDisabled() { @@ -107,8 +108,19 @@ this.listWidth = listWidth; } - public void setData(Map<String, InputStream> data) { + public String getAcceptedTypes() { + return acceptedTypes; + } + + public void setAcceptedTypes(String acceptedTypes) { + this.acceptedTypes = acceptedTypes; + } + + public ArrayList getData() { + return data; + } + + public void setData(ArrayList data) { this.data = data; } - } Added: trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttleConverter.java =================================================================== --- trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttleConverter.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttleConverter.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -0,0 +1,33 @@ +package listShuttle; +import java.util.ArrayList; +import java.util.StringTokenizer; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + +import util.data.Data; + +public class ListShuttleConverter implements Converter { + + public Object getAsObject(FacesContext arg0, UIComponent arg1, String arg2) { + String [] str = arg2.split(":"); + return new Data(Integer.parseInt(str[0]), str[1], str[2], str[3],str[4]); + } +//list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); + public String getAsString(FacesContext arg0, UIComponent arg1, Object arg2) { + Data data = (Data)arg2; + return data.getInt0() + ":" + data.getStr0() + ":" + data.getStr1() + ":" + data.getStr2() + ":" + data.getStr3(); + } + +} +// public Object getAsObject(FacesContext context, UIComponent component, +// String value) { +// int index = value.indexOf(':'); +// return new OptionItem(value.substring(0, index), Integer.valueOf(value.substring(index + 1))); +// } +// public String getAsString(FacesContext context, UIComponent component, +// Object value) { +// OptionItem optionItem = (OptionItem) value; +// return optionItem.getName() + ":" + optionItem.getPrice(); +// } Added: trunk/test-applications/jsp/src/main/java/orderingList/OrderingListConverter.java =================================================================== --- trunk/test-applications/jsp/src/main/java/orderingList/OrderingListConverter.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/orderingList/OrderingListConverter.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -0,0 +1,33 @@ +package orderingList; +import java.util.ArrayList; +import java.util.StringTokenizer; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + +import util.data.Data; + +public class OrderingListConverter implements Converter { + + public Object getAsObject(FacesContext arg0, UIComponent arg1, String arg2) { + String [] str = arg2.split(":"); + return new Data(Integer.parseInt(str[0]), str[1], str[2], str[3],str[4]); + } +//list.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5])); + public String getAsString(FacesContext arg0, UIComponent arg1, Object arg2) { + Data data = (Data)arg2; + return data.getInt0() + ":" + data.getStr0() + ":" + data.getStr1() + ":" + data.getStr2() + ":" + data.getStr3(); + } + +} +// public Object getAsObject(FacesContext context, UIComponent component, +// String value) { +// int index = value.indexOf(':'); +// return new OptionItem(value.substring(0, index), Integer.valueOf(value.substring(index + 1))); +// } +// public String getAsString(FacesContext context, UIComponent component, +// Object value) { +// OptionItem optionItem = (OptionItem) value; +// return optionItem.getName() + ":" + optionItem.getPrice(); +// } Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -25,11 +25,11 @@ srcContainer = "Blank"; map = new MapComponent(); // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); - map.add("Blank", add("/pages/Blank/Blank", new boolean [] {false, true, true})); - map.add("Calendar", add("/Calendar/Calendar", new boolean [] {false, true, true})); - map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {false, true, false})); - map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {false, true, true})); - map.add("DataTable", add("/DataTable/DataTable", new boolean [] {false, true, true})); + map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true, true})); + map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true, true})); + map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, true, false})); + map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true, true})); + map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true, true})); map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false, false})); map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {false, true, true})); map.add("Effect", add("/Effect/Effect", new boolean [] {false, false, false})); @@ -69,6 +69,7 @@ map.add("FileUpload", add("/FileUpload/FileUpload", new boolean [] {false, false, false})); map.add("InplaceSelect", add("/InplaceSelect/InplaceSelect", new boolean [] {false, false, false})); map.add("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, false, false})); + map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); Added: trunk/test-applications/jsp/src/main/java/skinning/Skinning.java =================================================================== --- trunk/test-applications/jsp/src/main/java/skinning/Skinning.java (rev 0) +++ trunk/test-applications/jsp/src/main/java/skinning/Skinning.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -0,0 +1,210 @@ +package skinning; + +public class Skinning { + private String selectSkinning; + private String skinning; + private String skinningClass; + private String commandButton; + private String commandLink; + private String dataTable; + private String inputSecret; + private String inputText; + private String inputTextarea; + private String outputLink; + private String outputText; + private String panelGrid; + private String selectBooleanCheckbox; + private String selectManyCheckbox; + private String selectManyListBox; + private String selectManyMenu; + private String selectOneListbox; + private String selectOneMenu; + private String selectOneRadio; + + public Skinning() { + commandButton = "rich-button"; + commandLink = "rich-link"; + dataTable = "rich-isindex"; + inputSecret = "rich-button"; + inputText = "rich-input"; + inputTextarea = "rich-textarea"; + commandLink = "rich-link"; + outputLink = "rich-link"; + outputText = "rich-legend"; + panelGrid = "rich-fieldset"; + selectBooleanCheckbox = "rich-select"; + selectManyCheckbox = "rich-select"; + selectManyListBox = "rich-select"; + selectManyMenu = "rich-select"; + selectOneListbox = "rich-select"; + selectOneMenu = "rich-select"; + selectOneRadio = "rich-select"; + skinning = "disable"; + skinningClass = "disable"; + } + + public String getCommandButton() { + return commandButton; + } + + public void setCommandButton(String commandButton) { + this.commandButton = commandButton; + } + + public String getCommandLink() { + return commandLink; + } + + public void setOmmandLink(String commandLink) { + this.commandLink = commandLink; + } + + public String getDataTable() { + return dataTable; + } + + public void setDataTable(String dataTable) { + this.dataTable = dataTable; + } + + public String getInputSecret() { + return inputSecret; + } + + public void setInputSecret(String inputSecret) { + this.inputSecret = inputSecret; + } + + public String getInputText() { + return inputText; + } + + public void setInputText(String inputText) { + this.inputText = inputText; + } + + public String getInputTextarea() { + return inputTextarea; + } + + public void setInputTextarea(String inputTextarea) { + this.inputTextarea = inputTextarea; + } + + public String getOutputLink() { + return outputLink; + } + + public void setOutputLink(String outputLink) { + this.outputLink = outputLink; + } + + public String getOutputText() { + return outputText; + } + + public void setOutputText(String outputText) { + this.outputText = outputText; + } + + public String getPanelGrid() { + return panelGrid; + } + + public void setPanelGrid(String panelGrid) { + this.panelGrid = panelGrid; + } + + public String getSelectBooleanCheckbox() { + return selectBooleanCheckbox; + } + + public void setSelectBooleanCheckbox(String selectBooleanCheckbox) { + this.selectBooleanCheckbox = selectBooleanCheckbox; + } + + public String getSelectManyListBox() { + return selectManyListBox; + } + + public void setSelectManyListBox(String selectManyListBox) { + this.selectManyListBox = selectManyListBox; + } + + public String getSelectManyMenu() { + return selectManyMenu; + } + + public void setSelectManyMenu(String selectManyMenu) { + this.selectManyMenu = selectManyMenu; + } + + public String getSelectOneListbox() { + return selectOneListbox; + } + + public void setSelectOneListbox(String selectOneListbox) { + this.selectOneListbox = selectOneListbox; + } + + public String getSelectOneMenu() { + return selectOneMenu; + } + + public void setSelectOneMenu(String selectOneMenu) { + this.selectOneMenu = selectOneMenu; + } + + public String getSelectOneRadio() { + return selectOneRadio; + } + + public void setSelectOneRadio(String selectOneRadio) { + this.selectOneRadio = selectOneRadio; + } + + public String getSelectManyCheckbox() { + return selectManyCheckbox; + } + + public void setSelectManyCheckbox(String selectManyCheckbox) { + this.selectManyCheckbox = selectManyCheckbox; + } + + public void setCommandLink(String commandLink) { + this.commandLink = commandLink; + } + + public String getSelectSkinning() { + return selectSkinning; + } + + public String getSkinning() { + return skinning; + } + + public void setSkinning(String skinning) { + this.skinning = skinning; + } + + public String getSkinningClass() { + return skinningClass; + } + + public void setSkinningClass(String skinningClass) { + this.skinningClass = skinningClass; + } + + public void setSelectSkinning(String selectSkinning) { + if (selectSkinning.equals("skinning")) { + setSkinning("enable"); + } else if (selectSkinning.equals("skinningClass")) { + setSkinning("disable"); + setSkinningClass("enable"); + } else { + setSkinning("disable"); + setSkinningClass("disable"); + } + this.selectSkinning = selectSkinning; + } +} Modified: trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -19,11 +19,13 @@ private String currentSortOrder; private String filterInput; private String filterValue; + private final Comparator<Data> comparator = new Comparator<Data> () { public int compare(Data o1, Data o2) { - return o2.getStr1().length() - o1.getStr1().length(); + return o1.getStr1().length() - o2.getStr1().length(); } }; + public String getFilterValue() { return filterValue; } Modified: trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java =================================================================== --- trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -32,6 +32,7 @@ headerSpacing="20px"; label="Tab Label"; labelWidth="150px"; + selectedTab = "tabTwo"; activeTabStyle=null; disabledTabStyle=null; Modified: trunk/test-applications/jsp/src/main/java/util/style/Style.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-03-11 13:27:33 UTC (rev 6686) @@ -62,7 +62,10 @@ private String controlClass; private String captionStyle; private String activeClass; - + private String trailerStyleClass; + private String barClass; + private String handleStyle; + private String styleA; private String styleClassA; private String selectStyleA; @@ -73,7 +76,7 @@ private String columnClassesA; private String footerClassA; private String headerClassA; - + public Style() { style = "style"; styleClass = "styleClass"; @@ -133,7 +136,10 @@ controlClass = "controlClass"; captionStyle = "captionStyle"; activeClass = "activeClass"; - + trailerStyleClass = "trailerStyleClass"; + barClass = "barClass"; + handleStyle = "handleStyle"; + styleA = "styleA"; styleClassA = "styleClassA"; selectStyleA = "selectStyleA"; @@ -697,4 +703,28 @@ public void setHandleStyleClass(String handleStyleClass) { this.handleStyleClass = handleStyleClass; } + + public String getTrailerStyleClass() { + return trailerStyleClass; + } + + public void setTrailerStyleClass(String trailerStyleClass) { + this.trailerStyleClass = trailerStyleClass; + } + + public String getBarClass() { + return barClass; + } + + public void setBarClass(String barClass) { + this.barClass = barClass; + } + + public String getHandleStyle() { + return handleStyle; + } + + public void setHandleStyle(String handleStyle) { + this.handleStyle = handleStyle; + } } Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -8,18 +8,19 @@ <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" action="#{dfs.act}" actionListener="#{dfs.actListener}" rendered="#{dfs.rendered}" binding="#{inventoryList.dataFilterSlider}" for="carList" forValRef="inventoryList.carInventory" - filterBy="getMileage" manualInput="true" storeResults="true" width="400px" + filterBy="getMileage" manualInput="true" width="400px" styleClass="#{style.styleClass}" rangeStyleClass="#{style.rangeStyleClass}" trailerStyleClass="#{style.trailerStyleClass}" style="#{style.style}" fieldStyleClass="#{style.fieldStyleClass}" trackStyleClass="#{style.trackStyleClass}" handleStyleClass="#{style.handleStyleClass}" + onslide="true" onchange="true" storeResults="true" startRange="10000" endRange="60000" increment="10000" trailer="true" handleValue="10000" id="dfsID" onbeforedomupdate="#{event.onbeforedomupdate}" - onchange="#{event.onchange}" onclick="#{event.onclick}" + onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onerror="#{event.onerror}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" - onmouseup="#{event.onmouseup}" onslide="#{event.onslide}" + onmouseup="#{event.onmouseup}" onSlideSubmit="#{event.onSlideSubmit}"> </rich:dataFilterSlider> Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -4,42 +4,54 @@ <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <f:subview id="FileUploadSubviewID"> -<rich:fileUpload id="fileUploadID" disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}" -required="#{fileUpload.required}" requiredMessage="#{fileUpload.requiredMessage}" rendered="#{fileUpload.rendered}" -listHeight="#{fileUpload.listHeight}" listWidth="#{fileUpload.listHeight}" data="#{fileUpload.data}" -maxFilesQuantity="#{fileUpload.maxFilesQuantity}" fileUploadListener="#{fileUpload.fileUploadListener}"> - <f:facet name="progress"> - <progressBar:progressBar style="height: 5px; width: 250px;"> - </progressBar:progressBar> - </f:facet> - <f:facet name="label"> - <h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText> - </f:facet> -</rich:fileUpload> + <rich:fileUpload id="fileUploadID" uploadData="#{fileUpload.data}" + acceptedTypes="#{fileUpload.acceptedTypes}" + disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}" + required="#{fileUpload.required}" + requiredMessage="#{fileUpload.requiredMessage}" + rendered="#{fileUpload.rendered}" + listHeight="#{fileUpload.listHeight}" + listWidth="#{fileUpload.listHeight}" + maxFilesQuantity="#{fileUpload.maxFilesQuantity}" + fileUploadListener="#{fileUpload.fileUploadListener}"> + <f:facet name="label"> + <h:outputText value="{_KB}KB from {KB}KB uploaded :[ {mm}:{ss} ]"></h:outputText> + </f:facet> + </rich:fileUpload> + -<h:panelGrid columns="2"> - <h:outputText value="listHeight"></h:outputText> - <h:inputText value="#{fileUpload.listHeight}" onchange="submit();"></h:inputText> + <h:panelGrid columns="2"> + <h:outputText value="acceptedTypes"></h:outputText> + <h:inputText value="#{fileUpload.acceptedTypes}" onchange="submit();"></h:inputText> - <h:outputText value="listWidth"></h:outputText> - <h:inputText value="#{fileUpload.listWidth}" onchange="submit();"></h:inputText> + <h:outputText value="listHeight"></h:outputText> + <h:inputText value="#{fileUpload.listHeight}" onchange="submit();"></h:inputText> - <h:outputText value="maxFilesQuantity"></h:outputText> - <h:inputText value="#{fileUpload.maxFilesQuantity}" onchange="submit();"></h:inputText> - - <h:outputText value="autoclear"></h:outputText> - <h:selectBooleanCheckbox value="#{fileUpload.autoclear}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="disabled"></h:outputText> - <h:selectBooleanCheckbox value="#{fileUpload.disabled}" onchange="submit();"></h:selectBooleanCheckbox> - - <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{fileUpload.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + <h:outputText value="listWidth"></h:outputText> + <h:inputText value="#{fileUpload.listWidth}" onchange="submit();"></h:inputText> - <h:outputText value="required"></h:outputText> - <h:selectBooleanCheckbox value="#{fileUpload.required}" onchange="submit();"></h:selectBooleanCheckbox> + <h:outputText value="maxFilesQuantity"></h:outputText> + <h:inputText value="#{fileUpload.maxFilesQuantity}" + onchange="submit();"></h:inputText> - <h:outputText value="requiredMessage"></h:outputText> - <h:inputText value="#{fileUpload.requiredMessage}" onchange="submit();"></h:inputText> -</h:panelGrid> + <h:outputText value="autoclear"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.autoclear}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="disabled"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.disabled}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.rendered}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="required"></h:outputText> + <h:selectBooleanCheckbox value="#{fileUpload.required}" + onchange="submit();"></h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage"></h:outputText> + <h:inputText value="#{fileUpload.requiredMessage}" + onchange="submit();"></h:inputText> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -7,7 +7,7 @@ This is because such an error can easily be made at programming level, <br /> and while invisible for the user who does not understand or cannot <br /> acquire the source code, many of those -<rich:inplaceInput inputMaxLength="#{inplaceInput.inputMaxLength}" +<rich:inplaceInput inputMaxLength="#{inplaceInput.inputMaxLength}" inputWidth="#{inplaceInput.inputWidth}" maxInputWidth="#{inplaceInput.maxInputWidth}" minInputWidth="#{inplaceInput.minInputWidth}" @@ -25,6 +25,7 @@ immediate="#{inplaceInput.immediate}"> </rich:inplaceInput> are easy to exploit. + <h:panelGrid columns="2"> <a4j:commandButton value="refresh" reRender="inplaceInputValueCLID"></a4j:commandButton> <h:outputText id="inplaceInputValueCLID" Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -20,7 +20,7 @@ <h:panelGroup> <h:form> - <rich:panel z + <rich:panel onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" style="width:200px;" headerClass="hea2" bodyClass="bo3"> Modified: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -4,19 +4,16 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <f:subview id="progressBarSubviewID"> -<rich:panelMenu> -<rich:panelMenuItem> <rich:progressBar id="progressBarID" value="#{progressBar.value}" style="width: 450px; height: 19px;#{style.style};" completeClass="#{style.completeClass}" finishClass="#{style.finishClass}" initialClass="#{style.initialClass}" remainClass="#{style.remainClass}" styleClass="#{style.styleClass}" mode="#{progressBar.mode}" enabled="#{progressBar.enabled}" actionListener="#{progressBar.actionListener}" - interval="#{progressBar.interval}" action="#{progressBar.action}" + interval="#{progressBar.interval}" maxValue="#{progressBar.maxValue}" minValue="#{progressBar.minValue}" rendered="#{progressBar.rendered}" reRender="loadInfoPBID,valuePBID" progressVar="progressVar" parameters="params:'%'" reRenderAfterComplete="completedPBID" ignoreDupResponses="#{progressBar.ignoreDupResponses}" - dualColoredLabel="#{progressBar.dualColoredLabel}" onbeforedomupdate="#{event.onbeforedomupdate}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" @@ -33,17 +30,17 @@ <h:outputText value="{minValue} {params} / {value} {params}/ {maxValue} {params}"></h:outputText> <h:outputText id="loadInfoPBID" - value="[Load: #{progressBar.loadInfo}] " /> + value="[Load: #{progressBar.loadInfo}]" /> <h:graphicImage value="/pics/ajax_process.gif" /> </rich:progressBar> - </rich:panelMenuItem> - </rich:panelMenu> + <f:verbatim> <br /> </f:verbatim> + <h:outputText - value="[parameters=params:'%'], [{minValue} {params} / {value} {params}/ {maxValue} {params}]" /> + value="[parameters=params:'%'], [{progressVar} | {minValue} {params} / {value} {params}/ {maxValue} {params}]" /> <h:panelGrid columns="1"> <a4j:commandButton value="getValue" onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton> Added: trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -0,0 +1,132 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="ajax"%> +<%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="richfaces"%> + +<f:subview id="skinningSubviewID"> + <h:panelGrid columns="2" border="2" > + <h:outputText value="styleClass"></h:outputText> + <h:outputText value="components"></h:outputText> + + <h:panelGroup> + <h:outputText value="commandButton "></h:outputText> + <h:inputText value="#{skinning.commandButton}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:commandButton value="commandButton" + styleClass="#{skinning.commandButton}"></h:commandButton> + + <h:panelGroup> + <h:outputText value="commandLink "></h:outputText> + <h:inputText value="#{skinning.commandLink}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:commandLink value="commandLink" + styleClass="#{skinning.commandLink}"></h:commandLink> + + <h:panelGroup> + <h:outputText value="dataTable "></h:outputText> + <h:inputText value="#{skinning.dataTable}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:dataTable value="#{dataOrderedList.defaultArr}" var="def" + styleClass="#{skinning.dataTable}"> + <h:column> + <h:outputText value="#{def}"></h:outputText> + </h:column> + </h:dataTable> + + <h:panelGroup> + <h:outputText value="inputSecret "></h:outputText> + <h:inputText value="#{skinning.inputSecret}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:inputSecret value="secret" styleClass="#{skinning.inputSecret}"></h:inputSecret> + + <h:panelGroup> + <h:outputText value="inputText "></h:outputText> + <h:inputText value="#{skinning.inputText}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:inputText value="inputText" styleClass="#{skinning.inputText}"></h:inputText> + + <h:panelGroup> + <h:outputText value="inputTextarea "></h:outputText> + <h:inputText value="#{skinning.inputTextarea}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:inputTextarea rows="4" cols="5" value="inputTextarea" + styleClass="#{skinning.inputTextarea}"></h:inputTextarea> + + <h:panelGroup> + <h:outputText value="outputLink "></h:outputText> + <h:inputText value="#{skinning.outputLink}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:outputLink styleClass="#{skinning.outputLink}"></h:outputLink> + + <h:panelGroup> + <h:outputText value="outputText "></h:outputText> + <h:inputText value="#{skinning.outputText}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:outputText value="outputText" styleClass="#{skinning.outputText}"></h:outputText> + + <h:panelGroup> + <h:outputText value="panelGrid "></h:outputText> + <h:inputText value="#{skinning.outputText}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:panelGrid columns="1" styleClass="#{skinning.outputText}"> + <h:panelGroup> + <h:outputText value="panelGrid"></h:outputText> + </h:panelGroup> + </h:panelGrid> + + <h:panelGroup> + <h:outputText value="selectBooleanCheckbox "></h:outputText> + <h:inputText value="#{skinning.selectBooleanCheckbox}" + onchange="submit();"></h:inputText> + </h:panelGroup> + <h:panelGroup> + <h:selectBooleanCheckbox value="true" + styleClass="#{skinning.selectBooleanCheckbox}"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="false" + styleClass="#{skinning.selectBooleanCheckbox}"></h:selectBooleanCheckbox> + </h:panelGroup> + + <h:panelGroup> + <h:outputText value="selectManyCheckbox "></h:outputText> + <h:inputText value="#{skinning.selectManyCheckbox}" + onchange="submit();"></h:inputText> + </h:panelGroup> + <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}"> + <f:selectItems value="#{combobox.selectItem}" /> + </h:selectManyCheckbox> + + <h:panelGroup> + <h:outputText value="selectManyMenu "></h:outputText> + <h:inputText value="#{skinning.selectManyMenu}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:selectManyMenu styleClass="#{skinning.selectManyMenu}"> + <f:selectItems value="#{combobox.selectItem}" /> + </h:selectManyMenu> + + <h:panelGroup> + <h:outputText value="selectOneListbox "></h:outputText> + <h:inputText value="#{skinning.selectOneListbox}" + onchange="submit();"></h:inputText> + </h:panelGroup> + <h:selectOneListbox styleClass="#{skinning.selectOneListbox}"> + <f:selectItems value="#{combobox.selectItem}" /> + </h:selectOneListbox> + + <h:panelGroup> + <h:outputText value="selectOneMenu "></h:outputText> + <h:inputText value="#{skinning.selectOneMenu}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:selectOneMenu styleClass="#{skinning.selectOneMenu}"> + <f:selectItems value="#{combobox.selectItem}" /> + </h:selectOneMenu> + + <h:panelGroup> + <h:outputText value="selectOneRadio"></h:outputText> + <h:inputText value="#{skinning.selectOneRadio}" onchange="submit();"></h:inputText> + </h:panelGroup> + <h:selectOneRadio styleClass="#{skinning.selectOneRadio}"> + <f:selectItems value="#{combobox.selectItem}" /> + </h:selectOneRadio> + + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -2,7 +2,9 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + <f:subview id="sortingAndFilteringSubviewID"> + <h:panelGrid columns="9" border="1" style="font-size:12px"> <h:outputText value="#1"></h:outputText> <h:outputText value="#2"></h:outputText> @@ -41,7 +43,8 @@ <h:outputText value=" filterExpression='data > filterValue"></h:outputText> </h:panelGrid> <h:panelGrid columns="1" title="7"> - <h:outputText value="filterValue='/pics/error.gif'"></h:outputText> + <h:outputText value="sortBy"></h:outputText> + <h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText> </h:panelGrid> <h:panelGrid columns="1" title="8"> <h:outputText value="filterBy" /> @@ -50,9 +53,12 @@ <h:outputText value="sortBy"></h:outputText> </h:panelGrid> </h:panelGrid> - <rich:dataTable id="dataTableSAFID" value="#{sortingAndFiltering.data}" var="data"> - <rich:column sortBy="#{data.int0}" selfSorted="#{sortingAndFiltering.selfSorted}" sortOrder="#{sortingAndFiltering.sortOrder}" - filterBy="#{data.int0}"> + <rich:dataTable id="dataTableSAFID" value="#{sortingAndFiltering.data}" + var="data" sortMode="#{sortingAndFiltering.sortMode}"> + <f:facet name="caption"><h:outputText value="sortMode: #{sortingAndFiltering.sortMode}"></h:outputText></f:facet> + <rich:column sortBy="#{data.int0}" + selfSorted="#{sortingAndFiltering.selfSorted}" + sortOrder="#{sortingAndFiltering.sortOrder}" filterBy="#{data.int0}"> <f:facet name="header"> <h:outputText value="#1" /> </f:facet> @@ -61,7 +67,8 @@ <h:outputText value="#1" /> </f:facet> </rich:column> - <rich:column filterBy="#{data.int1}" sortBy="#{data.int1}" selfSorted="#{sortingAndFiltering.selfSorted}" + <rich:column filterBy="#{data.int1}" sortBy="#{data.int1}" + selfSorted="#{sortingAndFiltering.selfSorted}" filterEvent="ondblclick"> <f:facet name="header"> <h:outputText value="#2" /> @@ -71,7 +78,8 @@ <h:outputText value="#2" /> </f:facet> </rich:column> - <rich:column sortBy="#{data.str0}" sortOrder="#{sortingAndFiltering.sortOrder}" + <rich:column sortBy="#{data.str0}" + sortOrder="#{sortingAndFiltering.sortOrder}" filterMethod="#{sortingAndFiltering.filterMethod}"> <f:facet name="header"> <h:outputText value="#3" /> @@ -81,7 +89,8 @@ <h:outputText value="#3" /> </f:facet> </rich:column> - <rich:column filterBy="#{data.int2}" selfSorted="#{sortingAndFiltering.selfSorted}"> + <rich:column filterBy="#{data.int2}" + selfSorted="#{sortingAndFiltering.selfSorted}"> <f:facet name="header"> <h:outputText value="#4" /> </f:facet> @@ -90,7 +99,9 @@ <h:outputText value="#4" /> </f:facet> </rich:column> - <rich:column filterBy="#{data.str1}" sortOrder="#{sortingAndFiltering.sortOrder}" comparator="#{sortingAndFiltering.comparator}"> + <rich:column filterBy="#{data.str1}" + sortOrder="#{sortingAndFiltering.sortOrder}" + comparator="#{sortingAndFiltering.comparator}"> <f:facet name="header"> <h:outputText value="#5" /> </f:facet> @@ -99,7 +110,8 @@ <h:outputText value="#5" /> </f:facet> </rich:column> - <rich:column filterExpression="#{data.int3 > sortingAndFiltering.filterValue}"> + <rich:column + filterExpression="#{data.int3 > sortingAndFiltering.filterValue}"> <f:facet name="header"> <h:outputText value="#6" /> </f:facet> @@ -108,7 +120,8 @@ <h:outputText value="#6" /> </f:facet> </rich:column> - <rich:column filterValue="/pics/error.gif"> + <rich:column sortBy="#{data.str2}" + selfSorted="#{sortingAndFiltering.selfSorted}"> <f:facet name="header"> <h:outputText value="#7" /> </f:facet> @@ -138,8 +151,9 @@ </rich:column> </rich:dataTable> - <rich:dataTable id="dataTableFilterValueID" value="#{sortingAndFiltering.data}" var="data"> - <rich:column filterValue="/pics/error.gif"> + <rich:dataTable id="dataTableFilterValueID" + value="#{sortingAndFiltering.data}" var="data"> + <rich:column filterValue="/pics/error.gif" filterBy="#{data.str2}"> <f:facet name="header"> <h:outputText value="#7(filterValue='/pics/error.gif)'" /> </f:facet> @@ -153,22 +167,27 @@ <h:panelGrid columns="2"> <h:outputText value="filterMethod (#3):"></h:outputText> - <h:inputText value="#{sortingAndFiltering.filterInput}" onchange="submit();" /> + <h:inputText value="#{sortingAndFiltering.filterInput}" + onchange="submit();" /> <h:outputText value="filterValue (#6):"></h:outputText> - <h:inputText value="#{sortingAndFiltering.filterValue}" onchange="submit();" /> + <h:inputText value="#{sortingAndFiltering.filterValue}" + onchange="submit();" /> <h:outputText value="sortMode" /> - <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" onchange="submit();"> + <h:selectOneRadio value="#{sortingAndFiltering.sortMode}" + onchange="submit();"> <f:selectItem itemLabel="single" itemValue="single" /> - <f:selectItem itemLabel="multy" itemValue="multy" /> + <f:selectItem itemLabel="multi" itemValue="multi" /> </h:selectOneRadio> <h:outputText value="selfSorted" /> - <h:selectBooleanCheckbox value="#{sortingAndFiltering.selfSorted}" onchange="submit();" /> + <h:selectBooleanCheckbox value="#{sortingAndFiltering.selfSorted}" + onchange="submit();" /> <h:outputText value="sortOrder" /> - <h:selectOneRadio value="#{sortingAndFiltering.currentSortOrder}" onchange="submit();"> + <h:selectOneRadio value="#{sortingAndFiltering.currentSortOrder}" + onchange="submit();"> <f:selectItem itemLabel="DESCENDING" itemValue="DESCENDING" /> <f:selectItem itemLabel="UNSORTED" itemValue="UNSORTED" /> <f:selectItem itemLabel="ASCENDING" itemValue="ASCENDING" /> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-03-11 13:27:33 UTC (rev 6686) @@ -4,10 +4,15 @@ <faces-config> <converter> <converter-id>listShuttleConverter</converter-id> - <converter-class>util.converter.ListShuttleConverter</converter-class> + <converter-class>listShuttle.ListShuttleConverter</converter-class> </converter> <converter> <converter-id>orderingListConverter</converter-id> - <converter-class>util.converter.OrderingListConverter</converter-class> + <converter-class>orderingList.OrderingListConverter</converter-class> </converter> + <converter> + <converter-id>pickListConverter</converter-id> + <converter-class>pickList.PickListConverter</converter-class> + </converter> + </faces-config> Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skinning.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skinning.xml (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Skinning.xml 2008-03-11 13:27:33 UTC (rev 6686) @@ -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>skinning</managed-bean-name> + <managed-bean-class>skinning.Skinning</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-11 13:27:33 UTC (rev 6686) @@ -12,7 +12,7 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/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</param-value> + <param-value>/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</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> @@ -20,12 +20,24 @@ </context-param> <context-param> <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> - <param-value>enable</param-value> + <param-value>#{skinning.skinningClass}</param-value> </context-param> + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING</param-name> + <param-value>#{skinning.skinning}</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>createTempFiles</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>maxRequestSize</param-name> + <param-value>143482880</param-value> + </init-param> </filter> <filter-mapping> <filter-name>ajax4jsf</filter-name> Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -37,6 +37,11 @@ <h:selectOneMenu binding="#{skinBean.component}" onblur="submit();"> <a4j:support action="#{skinBean.change}" event="onchange" /> </h:selectOneMenu> + <h:selectOneMenu value="#{skinning.selectSkinning}" onblur="submit();"> + <f:selectItem itemLabel="none" itemValue="none"/> + <f:selectItem itemLabel="skinning" itemValue="SKINNING"/> + <f:selectItem itemLabel="skinningClass" itemValue="SKINNING_CLASSES"/> + </h:selectOneMenu> </h:panelGrid> <h:panelGrid columns="1"> Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2008-03-11 13:21:56 UTC (rev 6685) +++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2008-03-11 13:27:33 UTC (rev 6686) @@ -23,7 +23,7 @@ <h:commandLink value="Select" action="Map"></h:commandLink> <h:commandLink value="Customize page" action="CustomizePage"></h:commandLink> </h:panelGrid> - </rich:panel> + </rich:panel> <rich:spacer></rich:spacer> <rich:panel> <h:outputText style="align:right;" value="RichFace: #{a4j.version}" />