June 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r9068 - in trunk/test-applications/jsp/src/main: webapp/InplaceInput and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: adubovsky Date: 2008-06-17 05:15:36 -0400 (Tue, 17 Jun 2008) New Revision: 9068 Added: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp trunk/test-applications/jsp/src/main/webapp/styles/styles.css Log: Separete InplaceInput.jsp on 2 parts. Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-06-17 09:03:01 UTC (rev 9067) +++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-06-17 09:15:36 UTC (rev 9068) @@ -36,7 +36,7 @@ map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {false, true, true})); map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {false, true, true})); map.add("Insert", add("/Insert/Insert", new boolean [] {false, true, false})); - map.add("Message", add("/Message/Message", new boolean [] {false, true, true})); + map.add("Message", add("/Message/M essage", new boolean [] {false, true, true})); map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {false, true, true})); map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {false, true, true})); map.add("Panel", add("/Panel/Panel", new boolean [] {false, true, true})); @@ -67,7 +67,7 @@ map.add("SortingAndFiltering", add("/SortingAndFiltering/SortingAndFiltering", new boolean [] {false, false, false})); 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("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, true, false})); map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-06-17 09:03:01 UTC (rev 9067) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-06-17 09:15:36 UTC (rev 9068) @@ -3,187 +3,68 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="inplaceInputSubviewTableID"> - - <a4j:commandButton actionListener="#{customList.cars}" value = "Click" reRender="dataTableID"></a4j:commandButton> - - <rich:dataTable id = "dataTableID" cellpadding="0" cellspacing="0" value="#{customList.carsList}" - width="300" border="0" var="record"> - - <f:facet name="header"> - <rich:columnGroup> - <rich:column> - <h:outputText value="Cars" /> - </rich:column> - <rich:column> - <h:outputText value="Price" /> - </rich:column> - </rich:columnGroup> - </f:facet> - - <rich:subTable - var="expense" value=""> - <rich:column> - <h:outputText value="#{record.s0}"></h:outputText> - <f:facet name="footer"> - <rich:spacer /> - </f:facet> - </rich:column> - <rich:column> - <rich:inplaceInput defaultLabel="#{record.i0}">$ - </rich:inplaceInput> - </rich:column> - </rich:subTable> - - </rich:dataTable> -</f:subview> -<br /> <f:subview id="inplaceInputSubviewID"> - -<h:inputText value="For verify tabbing tabindex=3" size="25" tabindex="3"></h:inputText> <br/> - -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 - id = "inplaceInputId" - valueChangeListener="#{inplaceInput.valueChangeListener}" - converter="inplaceInputConverter" - converterMessage="Can't convert" - inputWidth="#{inplaceInput.inputWidth}" - maxInputWidth="#{inplaceInput.maxInputWidth}" - minInputWidth="#{inplaceInput.minInputWidth}" - required="#{inplaceInput.required}" - requiredMessage="#{inplaceInput.requiredMessage}" - tabindex="#{inplaceInput.tabindex}" - editEvent="#{inplaceInput.editEvent}" - defaultLabel="#{inplaceInput.defaultLabel}" - controlsVerticalPosition="#{inplaceInput.controlsVerticalPosition}" - controlsHorizontalPosition="#{inplaceInput.controlsHorizontalPosition}" - value="#{inplaceInput.value}" - selectOnEdit="#{inplaceInput.selectOnEdit}" - showControls="#{inplaceInput.showControls}" - rendered="#{inplaceInput.rendered}" - immediate="#{inplaceInput.immediate}" - layout = "#{inplaceInput.layout}" - onblur="#{event.onblur}" - onchange="#{event.onchange}" - onclick="#{event.onclick}" - ondblclick="#{event.ondblclick}" - oneditactivated="#{event.oneditactivated}" - oneditactivation="#{event.oneditactivation}" - onfocus="#{event.onfocus}" - oninputclick="#{event.oninputclick}" - oninputdblclick="#{event.oninputdblclick}" - oninputkeydown="#{event.oninputkeydown}" - oninputkeypress="#{event.oninputkeypress}" - oninputkeyup="#{event.oninputkeyup}" - oninputmousedown="#{event.oninputmousedown}" - oninputmousemove="#{event.oninputmousemove}" - oninputmouseout="#{event.oninputmouseout}" - oninputmouseover="#{event.oninputmouseover}" - oninputmouseup="#{event.oninputmouseup}" - onkeydown="#{event.onkeydown}" - onkeypress="#{event.onkeypress}" - onkeyup="#{event.onkeyup}" - onmousedown="#{event.onmousedown}" - onmousemove="#{event.onmousemove}" - onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" - onmouseup="#{event.onmouseup}" - onselect="#{event.onselect}" - onviewactivated="#{evant.onviewactivated}" - onviewactivation="#{event.onviewactivation}" - binding="#{inplaceInput.myInplaceInput}"> + <h:inputText value="For verify tabbing tabindex=3" size="25" tabindex="3"></h:inputText> + <f:verbatim><br /><br /></f:verbatim> + 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 + id = "inplaceInputId" + valueChangeListener="#{inplaceInput.valueChangeListener}" + converter="inplaceInputConverter" + converterMessage="Can't convert" + inputWidth="#{inplaceInput.inputWidth}" + maxInputWidth="#{inplaceInput.maxInputWidth}" + minInputWidth="#{inplaceInput.minInputWidth}" + required="#{inplaceInput.required}" + requiredMessage="#{inplaceInput.requiredMessage}" + tabindex="#{inplaceInput.tabindex}" + editEvent="#{inplaceInput.editEvent}" + defaultLabel="#{inplaceInput.defaultLabel}" + controlsVerticalPosition="#{inplaceInput.controlsVerticalPosition}" + controlsHorizontalPosition="#{inplaceInput.controlsHorizontalPosition}" + value="#{inplaceInput.value}" + selectOnEdit="#{inplaceInput.selectOnEdit}" + showControls="#{inplaceInput.showControls}" + rendered="#{inplaceInput.rendered}" + immediate="#{inplaceInput.immediate}" + layout = "#{inplaceInput.layout}" + onblur="#{event.onblur}" + onchange="#{event.onchange}" + onclick="#{event.onclick}" + ondblclick="#{event.ondblclick}" + oneditactivated="#{event.oneditactivated}" + oneditactivation="#{event.oneditactivation}" + onfocus="#{event.onfocus}" + oninputclick="#{event.oninputclick}" + oninputdblclick="#{event.oninputdblclick}" + oninputkeydown="#{event.oninputkeydown}" + oninputkeypress="#{event.oninputkeypress}" + oninputkeyup="#{event.oninputkeyup}" + oninputmousedown="#{event.oninputmousedown}" + oninputmousemove="#{event.oninputmousemove}" + oninputmouseout="#{event.oninputmouseout}" + oninputmouseover="#{event.oninputmouseover}" + oninputmouseup="#{event.oninputmouseup}" + onkeydown="#{event.onkeydown}" + onkeypress="#{event.onkeypress}" + onkeyup="#{event.onkeyup}" + onmousedown="#{event.onmousedown}" + onmousemove="#{event.onmousemove}" + onmouseout="#{event.onmouseout}" + onmouseover="#{event.onmouseover}" + onmouseup="#{event.onmouseup}" + onselect="#{event.onselect}" + onviewactivated="#{evant.onviewactivated}" + onviewactivation="#{event.onviewactivation}" + binding="#{inplaceInput.myInplaceInput}" > </rich:inplaceInput> - are easy to exploit. + are easy to exploit. <h:panelGrid columns="2"> - <a4j:commandButton value="refresh" reRender="inplaceInputValueCLID"></a4j:commandButton> + <a4j:commandButton value="reRender" reRender="inplaceInputValueCLID inplaceInputId"></a4j:commandButton> <h:outputText id="inplaceInputValueCLID" value="#{inplaceInput.valueCL}"></h:outputText> </h:panelGrid> - <h:panelGrid columns="2"> - <h:outputText value="value"></h:outputText> - <h:outputText id="inplaceInputValueID" value="#{inplaceInput.value}" > - </h:outputText> - - - <h:outputText value="defaultLabel"></h:outputText> - <h:inputText value="#{inplaceInput.defaultLabel}" onchange="submit();"> - </h:inputText> - - <h:outputText value="inputWidth"></h:outputText> - <h:inputText value="#{inplaceInput.inputWidth}" onchange="submit();"> - </h:inputText> - - <h:outputText value="maxInputWidth"></h:outputText> - <h:inputText value="#{inplaceInput.maxInputWidth}" onchange="submit();"> - </h:inputText> - - <h:outputText value="minInputWidth"></h:outputText> - <h:inputText value="#{inplaceInput.minInputWidth}" onchange="submit();"> - </h:inputText> - - <h:outputText value="tabindex"></h:outputText> - <h:inputText value="#{inplaceInput.tabindex}" onchange="submit();"> - </h:inputText> - - <h:outputText value="editEvent"></h:outputText> - <h:inputText value="#{inplaceInput.editEvent}" onchange="submit();"> - </h:inputText> - - <h:outputText value="controlsVerticalPosition"></h:outputText> - <h:selectOneRadio value="#{inplaceInput.controlsVerticalPosition}" onchange="submit();"> - <f:selectItem itemLabel="top" itemValue="top"/> - <f:selectItem itemLabel="bottom" itemValue="bottom"/> - <f:selectItem itemLabel="center" itemValue="center"/> - </h:selectOneRadio> - - <h:outputText value="controlsHorizontalPosition"></h:outputText> - <h:selectOneRadio value="#{inplaceInput.controlsHorizontalPosition}" onchange="submit();"> - <f:selectItem itemLabel="right" itemValue="right"/> - <f:selectItem itemLabel="center" itemValue="center"/> - <f:selectItem itemLabel="left" itemValue="left"/> - </h:selectOneRadio> - - <h:outputText value="selectOnEdit"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceInput.selectOnEdit}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="showControls"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceInput.showControls}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceInput.rendered}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="immediate"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceInput.immediate}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="required"></h:outputText> - <h:selectBooleanCheckbox value="#{inplaceInput.required}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="requiredMessage"></h:outputText> - <h:inputText value="#{inplaceInput.requiredMessage}" onchange="submit();"> - </h:inputText> - - <h:commandButton actionListener="#{inplaceInput.checkBinding}" value="Binding"></h:commandButton> - <h:outputText value="#{inplaceInput.bindLabel}"></h:outputText> - - <h:outputText value="layout"></h:outputText> - <h:inputText value="#{inplaceInput.layout}" onchange="submit();"> - </h:inputText> - - </h:panelGrid> - - <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.edit()" value="edit"></a4j:commandLink> <br/> - <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.save()" value="save"></a4j:commandLink> <br/> - <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.cancel()" value="cancel"></a4j:commandLink> <br/> - <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.getValue()" value="getValue"></a4j:commandLink> <br/> - <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.setValue('setValue')" value="setValuel"></a4j:commandLink> - </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInputProperty.jsp 2008-06-17 09:15:36 UTC (rev 9068) @@ -0,0 +1,89 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="inplaceInputPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="value"></h:outputText> + <h:outputText id="inplaceInputValueID" value="#{inplaceInput.value}" > + </h:outputText> + + <h:outputText value="defaultLabel"></h:outputText> + <h:inputText value="#{inplaceInput.defaultLabel}" onchange="submit();"> + </h:inputText> + + <h:outputText value="inputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.inputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="maxInputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.maxInputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="minInputWidth"></h:outputText> + <h:inputText value="#{inplaceInput.minInputWidth}" onchange="submit();"> + </h:inputText> + + <h:outputText value="tabindex"></h:outputText> + <h:inputText value="#{inplaceInput.tabindex}" onchange="submit();"> + </h:inputText> + + <h:outputText value="editEvent"></h:outputText> + <h:inputText value="#{inplaceInput.editEvent}" onchange="submit();"> + </h:inputText> + + <h:outputText value="controlsVerticalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceInput.controlsVerticalPosition}" onchange="submit();"> + <f:selectItem itemLabel="top" itemValue="top"/> + <f:selectItem itemLabel="bottom" itemValue="bottom"/> + <f:selectItem itemLabel="center" itemValue="center"/> + </h:selectOneRadio> + + <h:outputText value="controlsHorizontalPosition"></h:outputText> + <h:selectOneRadio value="#{inplaceInput.controlsHorizontalPosition}" onchange="submit();"> + <f:selectItem itemLabel="right" itemValue="right"/> + <f:selectItem itemLabel="center" itemValue="center"/> + <f:selectItem itemLabel="left" itemValue="left"/> + </h:selectOneRadio> + + <h:outputText value="selectOnEdit"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.selectOnEdit}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="showControls"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.showControls}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.rendered}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="immediate"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.immediate}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="required"></h:outputText> + <h:selectBooleanCheckbox value="#{inplaceInput.required}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage"></h:outputText> + <h:inputText value="#{inplaceInput.requiredMessage}" onchange="submit();"> + </h:inputText> + + <h:commandButton actionListener="#{inplaceInput.checkBinding}" value="Binding"></h:commandButton> + <h:outputText value="#{inplaceInput.bindLabel}"></h:outputText> + + <h:outputText value="layout"></h:outputText> + <h:inputText value="#{inplaceInput.layout}" onchange="submit();"> + </h:inputText> + + </h:panelGrid> + + <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.edit()" value="edit"></a4j:commandLink> <br/> + <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.save()" value="save"></a4j:commandLink> <br/> + <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.cancel()" value="cancel"></a4j:commandLink> <br/> + <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.getValue()" value="getValue"></a4j:commandLink> <br/> + <a4j:commandLink onclick="$('formID:inplaceInputSubviewID:inplaceInputId').component.setValue('setValue')" value="setValuel"></a4j:commandLink> + +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/styles/styles.css =================================================================== --- trunk/test-applications/jsp/src/main/webapp/styles/styles.css 2008-06-17 09:03:01 UTC (rev 9067) +++ trunk/test-applications/jsp/src/main/webapp/styles/styles.css 2008-06-17 09:15:36 UTC (rev 9068) @@ -190,7 +190,7 @@ } .rich-panel-header { - color: #F00 !important; + } .top {

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9067 - in trunk/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/js and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2008-06-17 05:03:01 -0400 (Tue, 17 Jun 2008) New Revision: 9067 Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: RF-3610 Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml =================================================================== --- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-06-17 08:33:51 UTC (rev 9066) +++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-06-17 09:03:01 UTC (rev 9067) @@ -115,12 +115,12 @@ <description>CSS style for upload button disabled</description> </property> <property> - <name>cancelButtonClass</name> + <name>stopButtonClass</name> <classname>java.lang.String</classname> <description>CSS style for cancel button</description> </property> <property> - <name>cancelButtonClassDisabled</name> + <name>stopButtonClassDisabled</name> <classname>java.lang.String</classname> <description>CSS style for cancel button disabled</description> </property> Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 08:33:51 UTC (rev 9066) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 09:03:01 UTC (rev 9067) @@ -816,7 +816,7 @@ }else { d1.onclick = function() { return this.upload();}.bind(this); } - this._updateClassNames(d1, d2, (this.runUpload) ? this.classes.CANCEL : this.classes.UPDATE, (this.runUpload) ? this.classes.CANCEL_CONTENT : this.classes.UPDATE_CONTENT); + this._updateClassNames(d1, d2, (this.runUpload) ? this.classes.STOP : this.classes.UPDATE, (this.runUpload) ? this.classes.STOP_CONTENT : this.classes.UPDATE_CONTENT); }, _updateClassNames: function (d1,d2,buttonClass,buttonContentClass) { Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17 08:33:51 UTC (rev 9066) +++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17 09:03:01 UTC (rev 9067) @@ -137,13 +137,13 @@ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start #{component.attributes["uploadButtonClass"]}', DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start-dis #{component.attributes["uploadButtonClassDisabled"]}' }, - CANCEL : { - ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["cancelButtonClass"]}', - DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["cancelButtonClassDisabled"]}' + STOP : { + ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["stopButtonClass"]}', + DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["stopButtonClassDisabled"]}' }, - CANCEL_CONTENT : { - ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop #{component.attributes["cancelButtonClass"]}', - DISABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop-dis #{component.attributes["cancelButtonClassDisabled"]}' + STOP_CONTENT : { + ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop #{component.attributes["stopButtonClass"]}', + DISABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop-dis #{component.attributes["stopButtonClassDisabled"]}' }, CLEAN : { ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["cleanButtonClass"]}',

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9066 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2008-06-17 04:33:51 -0400 (Tue, 17 Jun 2008) New Revision: 9066 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js Log: RF-3544 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 08:23:08 UTC (rev 9065) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 08:33:51 UTC (rev 9066) @@ -482,7 +482,7 @@ var progressW = this._progressBar.style.width; if (progressW == "") { progressW = 200; } if (progressW > this.fileEntryWidth) { - w = w + "px"; + w = (w - 2) + "px"; this._progressBar.style.width = w; var r = $(this._progressBar.id + ":remain"); if (r) {

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9065 - in trunk/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2008-06-17 04:23:08 -0400 (Tue, 17 Jun 2008) New Revision: 9065 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: RF-3527 Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 07:58:28 UTC (rev 9064) +++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-17 08:23:08 UTC (rev 9065) @@ -613,7 +613,7 @@ } return; } - this.createFrame(); + //this.createFrame(); var newEntry = new FileUploadEntry(elt, this); this.entries.push(newEntry); Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17 07:58:28 UTC (rev 9064) +++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-06-17 08:23:08 UTC (rev 9065) @@ -72,7 +72,8 @@ <div class="rich-fileupload-button-border" style=" float:left;"> <div class="#{addButtonClass}" onmouseover="this.className='rich-fileupload-button-light rich-fileupload-font'" onmousedown="this.className='rich-fileupload-button-press rich-fileupload-font'" onmouseup="this.className='rich-fileupload-button rich-fileupload-font'" onmouseout="this.className='rich-fileupload-button rich-fileupload-font'" style="position: relative;" - id="#{clientId}:add1"> + id="#{clientId}:add1" + > <div class="#{addButtonClassContent}" id="#{clientId}:add2" style="position: relative;">#{addLabel}</div> @@ -81,6 +82,7 @@ class="rich-fileupload-hidden" id="#{clientId}:file" name="#{clientId}:file" + onmousedown="$('#{clientId}').component.createFrame();" onchange="return $('#{clientId}').component.add(this);"/> </div> </div>

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9064 - trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2008-06-17 03:58:28 -0400 (Tue, 17 Jun 2008) New Revision: 9064 Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java Log: RF-3675 Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-06-16 20:53:40 UTC (rev 9063) +++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-06-17 07:58:28 UTC (rev 9064) @@ -97,10 +97,15 @@ String fileUploadIndicator = requestParameterMap.get(Filter.FILE_UPLOAD_INDICATOR); if (fileUploadIndicator != null && Boolean.TRUE.toString().equals(fileUploadIndicator)) { + UIFileUpload fileUpload = (UIFileUpload) component; String clientId = component.getClientId(context); - UIFileUpload fileUpload = (UIFileUpload) component; + String id = requestParameterMap.get("id"); + + if (!clientId.equals(id)) { + return; // Avoid listener calling for another fileUpload + } + String uid = requestParameterMap.get(Filter.UPLOAD_FILES_ID); - String id = requestParameterMap.get("id"); decreaseFileCounter(context, id); Map<String, MultipartRequest> map = (Map<String, MultipartRequest>) externalContext.getSessionMap() .get(Filter.REQUESTS_SESSIONS_BEAN_NAME);

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9063 - in trunk/sandbox/samples: editor-sample and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-06-16 16:53:40 -0400 (Mon, 16 Jun 2008) New Revision: 9063 Modified: trunk/sandbox/samples/dialog-window-sample/pom.xml trunk/sandbox/samples/editor-sample/pom.xml trunk/sandbox/samples/fileUploadPOC/pom.xml trunk/sandbox/samples/hotKey-sample/pom.xml trunk/sandbox/samples/panel2-sample/pom.xml trunk/sandbox/samples/rex-demo/pom.xml trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml Log: http://jira.jboss.com/jira/browse/RF-2415 Modified: trunk/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- trunk/sandbox/samples/dialog-window-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/dialog-window-sample/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -15,13 +15,18 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>dialog-window</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> Modified: trunk/sandbox/samples/editor-sample/pom.xml =================================================================== --- trunk/sandbox/samples/editor-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/editor-sample/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -15,13 +15,18 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>editor</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> Modified: trunk/sandbox/samples/fileUploadPOC/pom.xml =================================================================== --- trunk/sandbox/samples/fileUploadPOC/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/fileUploadPOC/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -9,8 +9,12 @@ <artifactId>fileUploadPOC</artifactId> <packaging>war</packaging> <name>fileUploadPOC Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> Modified: trunk/sandbox/samples/hotKey-sample/pom.xml =================================================================== --- trunk/sandbox/samples/hotKey-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/hotKey-sample/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -9,7 +9,6 @@ <artifactId>hotKey-sample</artifactId> <packaging>war</packaging> <name>hotKey-sample Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <build> <finalName>hotKey-sample</finalName> <plugins> @@ -29,6 +28,11 @@ <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>hotKey</artifactId> Modified: trunk/sandbox/samples/panel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/panel2-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/panel2-sample/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -12,15 +12,20 @@ <name>panel2-sample Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>panel2</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/sandbox/samples/rex-demo/pom.xml =================================================================== --- trunk/sandbox/samples/rex-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/rex-demo/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -9,7 +9,6 @@ <artifactId>rex-demo</artifactId> <packaging>war</packaging> <name>richfaces-extjs-demo Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <build> <finalName>rex-demo</finalName> <plugins> @@ -187,12 +186,6 @@ <version>1.0</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.8.1</version> Modified: trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) +++ trunk/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2008-06-16 20:53:40 UTC (rev 9063) @@ -13,15 +13,20 @@ <finalName>simpleTogglePanel2-sample</finalName> </build> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>simpleTogglePanel2</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9062 - in trunk/samples: calendar-sample and 52 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-06-16 16:48:05 -0400 (Mon, 16 Jun 2008) New Revision: 9062 Modified: trunk/samples/calendar-sample/pom.xml trunk/samples/combobox-sample/pom.xml trunk/samples/contextMenuDemo/pom.xml trunk/samples/dataFilterSliderDemo/pom.xml trunk/samples/dataTableDemo/pom.xml trunk/samples/datascroller-sample/pom.xml trunk/samples/dragDropDemo/pom.xml trunk/samples/dropdownmenu-sample/pom.xml trunk/samples/effect-sample/pom.xml trunk/samples/fileUploadDemo/pom.xml trunk/samples/functions-demo/pom.xml trunk/samples/gmap-sample/pom.xml trunk/samples/inplaceInput-sample/pom.xml trunk/samples/inplaceSelect-sample/pom.xml trunk/samples/inputNumberSliderDemo/pom.xml trunk/samples/inputNumberSpinnerDemo/pom.xml trunk/samples/jQuery-sample/pom.xml trunk/samples/jira-data/pom.xml trunk/samples/listShuttleDemo/pom.xml trunk/samples/local-value-demo/pom.xml trunk/samples/modalpanel-sample/pom.xml trunk/samples/orderingListDemo/pom.xml trunk/samples/panel-sample/pom.xml trunk/samples/panelbar-sample/pom.xml trunk/samples/panelmenu-sample/pom.xml trunk/samples/pickList-sample/pom.xml trunk/samples/pom.xml trunk/samples/progressBarDemo/pom.xml trunk/samples/rich-message-demo/pom.xml trunk/samples/richfaces-art-datatable/pom.xml trunk/samples/richfaces-ear-demo/ejb/pom.xml trunk/samples/richfaces-ear-demo/pom.xml trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml trunk/samples/richfaces-ear-demo/webapp/pom.xml trunk/samples/scrollableDataTableDemo/pom.xml trunk/samples/seamEAR/ear/pom.xml trunk/samples/seamEAR/ejbs/pom.xml trunk/samples/seamEAR/pom.xml trunk/samples/seamEAR/projects/pom.xml trunk/samples/seamEAR/wars/pom.xml trunk/samples/seamIntegration/pom.xml trunk/samples/separator-sample/pom.xml trunk/samples/simpleTogglePanel-sample/pom.xml trunk/samples/sortingFilteringDemo/pom.xml trunk/samples/stdcomponents-sample/pom.xml trunk/samples/suggestionbox-sample/pom.xml trunk/samples/tabPanelDemo/pom.xml trunk/samples/togglePanel-sample/pom.xml trunk/samples/tomahawkCompability/pom.xml trunk/samples/toolBarDemo/pom.xml trunk/samples/tooltip-sample/pom.xml trunk/samples/tree-demo/pom.xml trunk/samples/treeModelDemo/pom.xml trunk/samples/virtualEarth-sample/pom.xml Log: http://jira.jboss.com/jira/browse/RF-2415 Modified: trunk/samples/calendar-sample/pom.xml =================================================================== --- trunk/samples/calendar-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/calendar-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,29 +8,28 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>calendar-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>calendar-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>calendar</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>modal-panel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/combobox-sample/pom.xml =================================================================== --- trunk/samples/combobox-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/combobox-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -16,19 +16,19 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/contextMenuDemo/pom.xml =================================================================== --- trunk/samples/contextMenuDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/contextMenuDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,7 +9,6 @@ <artifactId>contextMenuDemo</artifactId> <packaging>war</packaging> <name>contextMenuDemo Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId> Modified: trunk/samples/dataFilterSliderDemo/pom.xml =================================================================== --- trunk/samples/dataFilterSliderDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/dataFilterSliderDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -5,21 +5,25 @@ <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>dataFilterSliderDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>dataFilterSliderDemo Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataFilterSlider</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/dataTableDemo/pom.xml =================================================================== --- trunk/samples/dataTableDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/dataTableDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dataTableDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <url>http://maven.apache.org</url> @@ -17,13 +16,13 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <version>3.2.2-SNAPSHOT</version> + <artifactId>richfaces-ui</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> Modified: trunk/samples/datascroller-sample/pom.xml =================================================================== --- trunk/samples/datascroller-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/datascroller-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>datascroller-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>datascroller</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/dragDropDemo/pom.xml =================================================================== --- trunk/samples/dragDropDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/dragDropDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dragDropDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>Drag/Drop demo app</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/dropdownmenu-sample/pom.xml =================================================================== --- trunk/samples/dropdownmenu-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/dropdownmenu-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,27 +7,31 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>dropdownmenu-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> <finalName>dropdownmenu-sample</finalName> </build> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dropdown-menu</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/effect-sample/pom.xml =================================================================== --- trunk/samples/effect-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/effect-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,14 +7,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>effect-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>effect Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>effect</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/fileUploadDemo/pom.xml =================================================================== --- trunk/samples/fileUploadDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/fileUploadDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -5,20 +5,19 @@ <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>fileUploadDemo</artifactId> <packaging>war</packaging> <name>fileUploadDemo Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>fileUpload</artifactId> - <version>${project.version}</version> + <artifactId>core</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> + <artifactId>fileUpload</artifactId> <version>${project.version}</version> </dependency> <dependency> Modified: trunk/samples/functions-demo/pom.xml =================================================================== --- trunk/samples/functions-demo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/functions-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -5,7 +5,7 @@ <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>functions-demo</artifactId> <packaging>war</packaging> <name>functions-demo Maven Webapp</name> @@ -15,6 +15,11 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>functions</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/samples/gmap-sample/pom.xml =================================================================== --- trunk/samples/gmap-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/gmap-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,14 +7,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>gmap-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>gmap-sample Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>gmap</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/inplaceInput-sample/pom.xml =================================================================== --- trunk/samples/inplaceInput-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/inplaceInput-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -13,15 +13,20 @@ <finalName>inplaceInput-sample</finalName> </build> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/inplaceSelect-sample/pom.xml =================================================================== --- trunk/samples/inplaceSelect-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/inplaceSelect-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -22,12 +22,17 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceSelect</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/samples/inputNumberSliderDemo/pom.xml =================================================================== --- trunk/samples/inputNumberSliderDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/inputNumberSliderDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>inputNumberSliderDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-slider</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- trunk/samples/inputNumberSpinnerDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/inputNumberSpinnerDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>inputNumberSpinnerDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/jQuery-sample/pom.xml =================================================================== --- trunk/samples/jQuery-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/jQuery-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,14 +7,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>jQuery-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>jQuery-sample Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/jira-data/pom.xml =================================================================== --- trunk/samples/jira-data/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/jira-data/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>jira-data</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> <dependency> @@ -18,7 +17,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> Modified: trunk/samples/listShuttleDemo/pom.xml =================================================================== --- trunk/samples/listShuttleDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/listShuttleDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -15,6 +15,11 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>listShuttle</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/samples/local-value-demo/pom.xml =================================================================== --- trunk/samples/local-value-demo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/local-value-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,21 +7,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>local-value-demo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>richfaces-local-value-demo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> - <scope>provided</scope> - </dependency> </dependencies> <build> <finalName>richfaces-local-value-demo</finalName> Modified: trunk/samples/modalpanel-sample/pom.xml =================================================================== --- trunk/samples/modalpanel-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/modalpanel-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,19 +7,23 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>modalpanel-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>modalpanel-sample Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>modal-panel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/orderingListDemo/pom.xml =================================================================== --- trunk/samples/orderingListDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/orderingListDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -15,6 +15,11 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/samples/panel-sample/pom.xml =================================================================== --- trunk/samples/panel-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/panel-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,19 +7,23 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panel-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>panel-sample Maven Webapp</name> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/panelbar-sample/pom.xml =================================================================== --- trunk/samples/panelbar-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/panelbar-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panelbar-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>panelbar</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/panelmenu-sample/pom.xml =================================================================== --- trunk/samples/panelmenu-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/panelmenu-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,19 +8,23 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>panelmenu-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>panelmenu-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>panelmenu</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/samples/pickList-sample/pom.xml =================================================================== --- trunk/samples/pickList-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/pickList-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -5,7 +5,7 @@ <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>pickList-sample</artifactId> <packaging>war</packaging> <name>JSF Maven Webapp</name> Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,7 +9,6 @@ <artifactId>samples</artifactId> <packaging>pom</packaging> <name>RichFaces Components Examples</name> - <version>3.2.2-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces/samples</url> <properties>  @@ -66,14 +65,9 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> - </dependency> - <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.14</version> @@ -376,7 +370,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> @@ -389,21 +383,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> <version>${myfaces}</version> Modified: trunk/samples/progressBarDemo/pom.xml =================================================================== --- trunk/samples/progressBarDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/progressBarDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -23,10 +23,15 @@ </plugins> </build> <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> Modified: trunk/samples/rich-message-demo/pom.xml =================================================================== --- trunk/samples/rich-message-demo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/rich-message-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,24 +8,23 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>rich-message-demo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>rich-message-demo</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/samples/richfaces-art-datatable/pom.xml =================================================================== --- trunk/samples/richfaces-art-datatable/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/richfaces-art-datatable/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,14 +8,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-art-datatable</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>richfaces-art-datatableDemo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/ejb/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/richfaces-ear-demo/ejb/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,7 +9,6 @@ <artifactId>ejb</artifactId> <packaging>ejb</packaging> <name>ejb</name> - <version>3.2.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <dependencies> <dependency> @@ -21,7 +20,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: trunk/samples/richfaces-ear-demo/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/richfaces-ear-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,7 +9,6 @@ <artifactId>richfaces-ear-demo</artifactId> <name>JSF 1.2/Jee5 enterprise application demo</name> <packaging>pom</packaging> - <version>3.2.2-SNAPSHOT</version> <build> <pluginManagement> <plugins> Modified: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,25 +9,24 @@ <artifactId>richfacesEAR</artifactId> <name>richfacesEAR</name> <packaging>ear</packaging> - <version>3.2.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <dependencies> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>ejb-client</type> </dependency> <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>webapp</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>war</type> </dependency> </dependencies> Modified: trunk/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/webapp/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/richfaces-ear-demo/webapp/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,7 +9,6 @@ <artifactId>webapp</artifactId> <packaging>war</packaging> <name>webapp Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <build> <finalName>webapp</finalName> @@ -46,17 +45,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <optional>true</optional> </dependency> <dependency> @@ -69,7 +68,7 @@ <dependency> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> <artifactId>ejb</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>ejb-client</type> <scope>provided</scope> <optional>true</optional> Modified: trunk/samples/scrollableDataTableDemo/pom.xml =================================================================== --- trunk/samples/scrollableDataTableDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/scrollableDataTableDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,34 +7,33 @@ <modelVersion>4.0.0</modelVersion> <artifactId>scrollableDataTableDemo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>scrollableDataTable Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>jira-data</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/samples/seamEAR/ear/pom.xml =================================================================== --- trunk/samples/seamEAR/ear/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamEAR/ear/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -3,7 +3,6 @@ <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ear</artifactId> <packaging>ear</packaging> - <version>3.2.2-SNAPSHOT</version> <name>ear assembly</name> <parent> <groupId>org.richfaces.samples</groupId> Modified: trunk/samples/seamEAR/ejbs/pom.xml =================================================================== --- trunk/samples/seamEAR/ejbs/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamEAR/ejbs/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -3,7 +3,6 @@ <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ejbs</artifactId> <packaging>ejb</packaging> - <version>3.2.2-SNAPSHOT</version> <name>enterprise java beans</name> <parent> <groupId>org.richfaces.samples</groupId> @@ -27,7 +26,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: trunk/samples/seamEAR/pom.xml =================================================================== --- trunk/samples/seamEAR/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamEAR/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -6,7 +6,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> - <version>3.2.2-SNAPSHOT</version> <artifactId>seamEAR</artifactId> <packaging>pom</packaging> <name>seam EAR project</name> @@ -68,23 +67,23 @@ org.richfaces.samples.seamEAR.projects </groupId> <artifactId>logging</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>primary-source</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR.wars</groupId> <artifactId>seamWebapp</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ejbs</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> Modified: trunk/samples/seamEAR/projects/pom.xml =================================================================== --- trunk/samples/seamEAR/projects/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamEAR/projects/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -1,7 +1,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.seamEAR</groupId> - <version>3.2.2-SNAPSHOT</version> <artifactId>projects</artifactId> <packaging>pom</packaging> <name>sub projects</name> Modified: trunk/samples/seamEAR/wars/pom.xml =================================================================== --- trunk/samples/seamEAR/wars/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamEAR/wars/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -4,7 +4,6 @@ <artifactId>wars</artifactId> <packaging>pom</packaging> <name>wars</name> - <version>3.2.2-SNAPSHOT</version> <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> Modified: trunk/samples/seamIntegration/pom.xml =================================================================== --- trunk/samples/seamIntegration/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/seamIntegration/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -12,7 +12,6 @@ <artifactId>seamIntegration</artifactId> <packaging>war</packaging> <name>seamIntegration Maven Webapp</name> - <version>3.2.2-SNAPSHOT</version> <build> <finalName>seamIntegration</finalName> <plugins> Modified: trunk/samples/separator-sample/pom.xml =================================================================== --- trunk/samples/separator-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/separator-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>separator-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>separator</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- trunk/samples/simpleTogglePanel-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/simpleTogglePanel-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>simpleTogglePanel-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>simpleTogglePanel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/sortingFilteringDemo/pom.xml =================================================================== --- trunk/samples/sortingFilteringDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/sortingFilteringDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -22,22 +22,22 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>jira-data</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/stdcomponents-sample/pom.xml =================================================================== --- trunk/samples/stdcomponents-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/stdcomponents-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -5,7 +5,7 @@ <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>stdcomponents-sample</artifactId> <packaging>war</packaging> <name>stdcomponents-sample Maven Webapp</name> Modified: trunk/samples/suggestionbox-sample/pom.xml =================================================================== --- trunk/samples/suggestionbox-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/suggestionbox-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>suggestionbox-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>suggestionbox-sample Maven Webapp</name> <build> @@ -17,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tabPanelDemo/pom.xml =================================================================== --- trunk/samples/tabPanelDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/tabPanelDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tabPanelDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -17,22 +16,22 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tabPanel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/togglePanel-sample/pom.xml =================================================================== --- trunk/samples/togglePanel-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/togglePanel-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>togglePanel-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,18 +15,23 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>togglePanel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tomahawkCompability/pom.xml =================================================================== --- trunk/samples/tomahawkCompability/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/tomahawkCompability/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,7 +8,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tomahawkCompability</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>tomahawkCompability Maven Webapp</name> <properties> Modified: trunk/samples/toolBarDemo/pom.xml =================================================================== --- trunk/samples/toolBarDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/toolBarDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>toolBarDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>webapp Maven Webapp</name> <build> @@ -16,13 +15,18 @@ <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>toolBar</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/tooltip-sample/pom.xml =================================================================== --- trunk/samples/tooltip-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/tooltip-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -8,24 +8,28 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tooltip-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>tooltip-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>tooltip</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/samples/tree-demo/pom.xml =================================================================== --- trunk/samples/tree-demo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/tree-demo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -7,24 +7,28 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>tree-demo</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>tree-demo Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> Modified: trunk/samples/treeModelDemo/pom.xml =================================================================== --- trunk/samples/treeModelDemo/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/treeModelDemo/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -1,29 +1,32 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.2.2-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.samples</groupId> - <artifactId>treeModelDemo</artifactId> - <version>3.2.2-SNAPSHOT</version> - <packaging>war</packaging> - <name>Tree Model Maven Webapp</name> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>treeModel</artifactId> - <version>3.2.2-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>tree</artifactId> - <version>3.2.2-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <finalName>treeModelDemo</finalName> - </build> +<?xml version="1.0" encoding="UTF-8"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.2.2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>treeModelDemo</artifactId> + <packaging>war</packaging> + <name>Tree Model Maven Webapp</name> + <build> + <finalName>treeModelDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>treeModel</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>tree</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/samples/virtualEarth-sample/pom.xml =================================================================== --- trunk/samples/virtualEarth-sample/pom.xml 2008-06-16 17:30:35 UTC (rev 9061) +++ trunk/samples/virtualEarth-sample/pom.xml 2008-06-16 20:48:05 UTC (rev 9062) @@ -9,14 +9,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>virtualEarth-sample</artifactId> - <version>3.2.2-SNAPSHOT</version> <packaging>war</packaging> <name>gmap-sample Maven Webapp</name> <dependencies> <dependency> <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> <artifactId>virtualEarth</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build>

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9061 - in trunk/framework: api/src/main/java/org/richfaces/event and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-06-16 13:30:35 -0400 (Mon, 16 Jun 2008) New Revision: 9061 Added: trunk/framework/api/src/main/java/org/richfaces/event/ComponentPhaseEventHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorPhaseEventHandler.java trunk/framework/impl/src/main/java/org/richfaces/util/ComponentPhaseEventHandlerUtils.java trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.component.ComponentPhaseEventHandler Removed: trunk/framework/api/src/main/java/org/richfaces/component/ComponentPhaseEventHandler.java Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/framework/impl/src/main/java/org/richfaces/event/ComponentViewPhaseListener.java Log: RF-2815 Deleted: trunk/framework/api/src/main/java/org/richfaces/component/ComponentPhaseEventHandler.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/ComponentPhaseEventHandler.java 2008-06-16 16:12:20 UTC (rev 9060) +++ trunk/framework/api/src/main/java/org/richfaces/component/ComponentPhaseEventHandler.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -1,9 +0,0 @@ -package org.richfaces.component; - -import javax.faces.event.PhaseEvent; - -public interface ComponentPhaseEventHandler { - - void beforePhase(PhaseEvent event); - -} Added: trunk/framework/api/src/main/java/org/richfaces/event/ComponentPhaseEventHandler.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/ComponentPhaseEventHandler.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/ComponentPhaseEventHandler.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -0,0 +1,12 @@ +package org.richfaces.event; + +import java.io.Serializable; + +import javax.faces.component.UIComponent; +import javax.faces.event.PhaseEvent; + +public interface ComponentPhaseEventHandler extends Serializable { + + void beforePhase(UIComponent component, PhaseEvent event); + +} Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-06-16 16:12:20 UTC (rev 9060) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -22,12 +22,11 @@ package org.ajax4jsf.application; import java.io.IOException; -import java.util.Map; +import java.util.List; import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.component.UIViewRoot; -import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; @@ -40,7 +39,9 @@ import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.event.ComponentPhaseEventHandler; import org.richfaces.event.ComponentViewPhaseListener; +import org.richfaces.util.ComponentPhaseEventHandlerUtils; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -91,7 +92,10 @@ ajaxContext.setAjaxRequest(false); } } - riRoot.addPhaseListener(new ComponentViewPhaseListener()); + + List<ComponentPhaseEventHandler> handlers = ComponentPhaseEventHandlerUtils.getHandlers(); + ComponentViewPhaseListener phaseListener = new ComponentViewPhaseListener(handlers); + riRoot.addPhaseListener(phaseListener); return riRoot; } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-06-16 16:12:20 UTC (rev 9060) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -61,7 +61,6 @@ import org.ajax4jsf.renderkit.AjaxChildrenRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.richfaces.component.ComponentPhaseEventHandler; /** * Base class for iterable components, like dataTable, Tomahawk dataList, @@ -71,7 +70,7 @@ * @author shura * */ -public abstract class UIDataAdaptor extends UIData implements AjaxDataEncoder, ComponentPhaseEventHandler { +public abstract class UIDataAdaptor extends UIData implements AjaxDataEncoder { /** * Added: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorPhaseEventHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorPhaseEventHandler.java (rev 0) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorPhaseEventHandler.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -0,0 +1,30 @@ +/** + * + */ +package org.ajax4jsf.component; + +import javax.faces.component.UIComponent; +import javax.faces.event.PhaseEvent; + +import org.richfaces.event.ComponentPhaseEventHandler; + +public class UIDataAdaptorPhaseEventHandler implements + ComponentPhaseEventHandler { + + /** + * + */ + private static final long serialVersionUID = -9027449995146628492L; + + /* (non-Javadoc) + * @see org.richfaces.component.ComponentPhaseEventHandler#beforePhase(javax.faces.component.UIComponent, javax.faces.event.PhaseEvent) + */ + public void beforePhase(UIComponent component, PhaseEvent event) { + if (component instanceof UIDataAdaptor) { + ((UIDataAdaptor) component).beforePhase(event); + + } + + } + +} Modified: trunk/framework/impl/src/main/java/org/richfaces/event/ComponentViewPhaseListener.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/event/ComponentViewPhaseListener.java 2008-06-16 16:12:20 UTC (rev 9060) +++ trunk/framework/impl/src/main/java/org/richfaces/event/ComponentViewPhaseListener.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -1,6 +1,7 @@ package org.richfaces.event; import java.util.Iterator; +import java.util.List; import javax.faces.component.UIComponent; import javax.faces.component.UIViewRoot; @@ -9,9 +10,6 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; -import org.richfaces.component.ComponentPhaseEventHandler; - - public class ComponentViewPhaseListener implements PhaseListener { /** @@ -19,13 +17,19 @@ */ private static final long serialVersionUID = -2437433246178955788L; + private List<ComponentPhaseEventHandler> handlers = null; + + public ComponentViewPhaseListener(List<ComponentPhaseEventHandler> handlers) { + this.handlers = handlers; + } + public void afterPhase(PhaseEvent event) { } private void doBeforePhase(PhaseEvent event, UIComponent component) { - if (component.isRendered()) { - if (component instanceof ComponentPhaseEventHandler) { - ((ComponentPhaseEventHandler) component).beforePhase(event); + if (component.isRendered() && handlers != null) { + for (ComponentPhaseEventHandler handler : handlers) { + handler.beforePhase(component, event); } Iterator<UIComponent> children = component.getFacetsAndChildren(); while (children.hasNext()) { Added: trunk/framework/impl/src/main/java/org/richfaces/util/ComponentPhaseEventHandlerUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/util/ComponentPhaseEventHandlerUtils.java (rev 0) +++ trunk/framework/impl/src/main/java/org/richfaces/util/ComponentPhaseEventHandlerUtils.java 2008-06-16 17:30:35 UTC (rev 9061) @@ -0,0 +1,61 @@ +package org.richfaces.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Scanner; + +import javax.faces.FacesException; + +import org.ajax4jsf.resource.util.URLToStreamHelper; +import org.ajax4jsf.util.ServicesUtils; +import org.richfaces.event.ComponentPhaseEventHandler; + +public class ComponentPhaseEventHandlerUtils{ + + static private List<ComponentPhaseEventHandler> handlers = null; + + private ComponentPhaseEventHandlerUtils() {} + + public static List<ComponentPhaseEventHandler> getHandlers() { + if (handlers == null) { + synchronized(ComponentPhaseEventHandlerUtils.class) { + if (handlers == null) { + init(); + } + } + } + return handlers; + } + + private static void init() { + handlers = new ArrayList<ComponentPhaseEventHandler>(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + String resource = "META-INF/services/org.richfaces.component.ComponentPhaseEventHandler"; + try { + Enumeration<URL> resources = loader.getResources(resource); + while (resources.hasMoreElements()) { + InputStream stream = URLToStreamHelper.urlToStreamSafe(resources.nextElement()); + Scanner scanner = new Scanner(stream); + while (scanner.hasNextLine()) { + String handlerClassName = scanner.nextLine(); + try { + Class<?> handlerClass = ServicesUtils.loadClass(loader, handlerClassName); + Object handler = handlerClass.newInstance(); + if (handler instanceof ComponentPhaseEventHandler) { + handlers.add((ComponentPhaseEventHandler) handler); + } + } catch (Exception e) { + throw new FacesException("Error create instance for class "+ handlerClassName, e); + } + } + scanner.close(); + } + } catch (IOException e) { + throw new FacesException("Error load resource "+ resource, e); + } + } +} Added: trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.component.ComponentPhaseEventHandler =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.component.ComponentPhaseEventHandler (rev 0) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.component.ComponentPhaseEventHandler 2008-06-16 17:30:35 UTC (rev 9061) @@ -0,0 +1 @@ +org.ajax4jsf.component.UIDataAdaptorPhaseEventHandler \ No newline at end of file

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9060 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2008-06-16 12:12:20 -0400 (Mon, 16 Jun 2008) New Revision: 9060 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/tab-panel.xhtml Log: http://jira.jboss.com/jira/browse/RF-3688 addon Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-06-16 16:12:20 UTC (rev 9060) @@ -1,5 +1,6 @@ package org.richfaces.demo.common; +import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -12,199 +13,252 @@ import java.util.StringTokenizer; import javax.faces.FacesException; +import javax.faces.application.ViewHandler; import javax.faces.context.FacesContext; +import javax.faces.event.ValueChangeEvent; import javax.servlet.http.HttpServletRequest; public class ComponentNavigator { - private String lastCompId = null; - private List components = null; - private ComponentDescriptor currentComponent; - private List componentGroups = null; - - public boolean getHasCurrentComponent() { - return currentComponent!=null; - } - - public ComponentDescriptor getCurrentComponent() { - String id = getComponentParam("c"); - if (id!=null) { - setCurrentComponent(findComponentById(id)); - lastCompId = id; - } else if (lastCompId!=null) { - setCurrentComponent(findComponentById(lastCompId)); - } else { - String uri = getComponentUri(); - setCurrentComponent(findComponentByUri(uri)); - } + private String lastCompId = null; - //set active tab for current component if any - if (null != currentComponent) { - String tab = getComponentParam("tab"); - if (null != tab) { - currentComponent.setActiveTab(tab); - } - } + private List components = null; - return currentComponent; - } + private ComponentDescriptor currentComponent; - private String getComponentUri() { - FacesContext fc = FacesContext.getCurrentInstance(); - return ((HttpServletRequest)fc.getExternalContext().getRequest()).getRequestURI(); - } - private String getComponentParam(String name) { - FacesContext fc = FacesContext.getCurrentInstance(); - String param = (String) fc.getExternalContext().getRequestParameterMap().get(name); - if (param!=null && param.trim().length()>0) { - return param; - } else { - return null; - } - } - - private List components_() { - if (components==null) { - loadComponents(); - } - return components; - } - public ComponentDescriptor findComponentByUri(String uri) { - Iterator it = components_().iterator(); - while (it.hasNext()) { - ComponentDescriptor component = (ComponentDescriptor) it.next(); - if (uri.endsWith(component.getDemoLocation())) { - return component; - } - } - return null; - } - public ComponentDescriptor findComponentById(String id) { - Iterator it = components_().iterator(); - while (it.hasNext()) { - ComponentDescriptor component = (ComponentDescriptor) it.next(); - if (component.getId().equals(id)) { - return component; - } - } - return null; - } - - public void setCurrentComponent(ComponentDescriptor currentComponent) { - if (currentComponent==null) { - this.currentComponent = (ComponentDescriptor)components_().get(0); - } - this.currentComponent = currentComponent; - } + private List componentGroups = null; - public List getComponentGroups() { - return componentGroups; - } - public void setComponentGroups(List componentGroups) { - this.componentGroups = componentGroups; - } - - private List getFilteredComponents(String group) { - List ret = new ArrayList(); - Iterator it = getComponents().iterator(); - while (it.hasNext()) { - ComponentDescriptor desc = (ComponentDescriptor) it.next(); - if (desc.getGroup().equals(group)) { - ret.add(desc); - } - } - return ret; - } - - public List getSelectComponents() { - return getFilteredComponents("richSelect"); - } - - public List getRichDragDropComponents() { - return getFilteredComponents("richDragDrop"); - } - public List getRichDataIterators() { - return getFilteredComponents("richDataIterators"); - } - public List getRichMenu() { - return getFilteredComponents("richMenu"); - } - public List getRichTree() { - return getFilteredComponents("richTree"); - } - public List getRichInputs() { - return getFilteredComponents("richInputs"); - } - public List getRichOutputs() { - return getFilteredComponents("richOutputs"); - } - public List getAjaxSupport() { - return getFilteredComponents("ajaxSupport"); - } - public List getAjaxResources() { - return getFilteredComponents("ajaxResources"); - } - public List getAjaxOutput() { - return getFilteredComponents("ajaxOutput"); - } - public List getAjaxMisc() { - return getFilteredComponents("ajaxMisc"); - } - public List getRichMisc() { - return getFilteredComponents("richMisc"); - } - - public List getComponents() { - Iterator it = components_().iterator(); - ComponentDescriptor cur = getCurrentComponent(); - while (it.hasNext()) { - ComponentDescriptor desc = (ComponentDescriptor) it.next(); - if (desc.equals(cur)) { - desc.setCurrent(true); - } else { - desc.setCurrent(false); - } - } - return components; - } + public boolean getHasCurrentComponent() { + return currentComponent != null; + } - public void setComponents(List components) { - this.components = components; - } - - private void loadComponents() { - Properties props = new Properties(); - List temp = new ArrayList(); - try { - InputStream is = this.getClass().getClassLoader().getResourceAsStream("/org/richfaces/demo/common/components.properties"); - props.load(is); - } catch (Exception e) { - throw new FacesException(e); - } - Set entries = props.entrySet(); - Iterator it = entries.iterator(); - while (it.hasNext()) { - Map.Entry e = (Map.Entry) it.next(); - ComponentDescriptor desc = new ComponentDescriptor(); - desc.setId(e.getKey().toString().trim()); - StringTokenizer toc = new StringTokenizer(e.getValue().toString(),","); -// #id=name,captionImage,iconImage,devGuideLocation,tldDocLocation,javaDocLocation - desc.setGroup(toc.nextToken().trim()); - desc.setName(toc.nextToken().trim()); - desc.setIconImage(toc.nextToken().trim()); - desc.setCaptionImage(toc.nextToken().trim()); - desc.setDevGuideLocation(toc.nextToken().trim()); - desc.setTldDocLocation(toc.nextToken().trim()); - desc.setJavaDocLocation(toc.nextToken().trim()); - desc.setDemoLocation(toc.nextToken().trim()); - temp.add(desc); - } - Collections.sort(temp, new Comparator() { - public int compare(Object o1, Object o2) { - ComponentDescriptor d1 = (ComponentDescriptor)o1; - ComponentDescriptor d2 = (ComponentDescriptor)o2; - return d1.getName().compareTo(d2.getName()); - }}); - setComponents(temp); - setCurrentComponent((ComponentDescriptor) temp.get(0)); - } + public ComponentDescriptor getCurrentComponent() { + String id = getComponentParam("c"); + if (id != null) { + setCurrentComponent(findComponentById(id)); + lastCompId = id; + } else if (lastCompId != null) { + setCurrentComponent(findComponentById(lastCompId)); + } else { + String uri = getComponentUri(); + setCurrentComponent(findComponentByUri(uri)); + } + + // set active tab for current component if any + if (null != currentComponent) { + String tab = getComponentParam("tab"); + if (null != tab) { + currentComponent.setActiveTab(tab); + } + } + + return currentComponent; + } + + private String getComponentUri() { + FacesContext fc = FacesContext.getCurrentInstance(); + return ((HttpServletRequest) fc.getExternalContext().getRequest()).getRequestURI(); + } + + private String getComponentParam(String name) { + FacesContext fc = FacesContext.getCurrentInstance(); + String param = (String) fc.getExternalContext().getRequestParameterMap().get(name); + if (param != null && param.trim().length() > 0) { + return param; + } else { + return null; + } + } + + private List components_() { + if (components == null) { + loadComponents(); + } + return components; + } + + public ComponentDescriptor findComponentByUri(String uri) { + Iterator it = components_().iterator(); + while (it.hasNext()) { + ComponentDescriptor component = (ComponentDescriptor) it.next(); + if (uri.endsWith(component.getDemoLocation())) { + return component; + } + } + return null; + } + + public ComponentDescriptor findComponentById(String id) { + Iterator it = components_().iterator(); + while (it.hasNext()) { + ComponentDescriptor component = (ComponentDescriptor) it.next(); + if (component.getId().equals(id)) { + return component; + } + } + return null; + } + + public void setCurrentComponent(ComponentDescriptor currentComponent) { + if (currentComponent == null) { + this.currentComponent = (ComponentDescriptor) components_().get(0); + } + this.currentComponent = currentComponent; + } + + public List getComponentGroups() { + return componentGroups; + } + + public void setComponentGroups(List componentGroups) { + this.componentGroups = componentGroups; + } + + private List getFilteredComponents(String group) { + List ret = new ArrayList(); + Iterator it = getComponents().iterator(); + while (it.hasNext()) { + ComponentDescriptor desc = (ComponentDescriptor) it.next(); + if (desc.getGroup().equals(group)) { + ret.add(desc); + } + } + return ret; + } + + public List getSelectComponents() { + return getFilteredComponents("richSelect"); + } + + public List getRichDragDropComponents() { + return getFilteredComponents("richDragDrop"); + } + + public List getRichDataIterators() { + return getFilteredComponents("richDataIterators"); + } + + public List getRichMenu() { + return getFilteredComponents("richMenu"); + } + + public List getRichTree() { + return getFilteredComponents("richTree"); + } + + public List getRichInputs() { + return getFilteredComponents("richInputs"); + } + + public List getRichOutputs() { + return getFilteredComponents("richOutputs"); + } + + public List getAjaxSupport() { + return getFilteredComponents("ajaxSupport"); + } + + public List getAjaxResources() { + return getFilteredComponents("ajaxResources"); + } + + public List getAjaxOutput() { + return getFilteredComponents("ajaxOutput"); + } + + public List getAjaxMisc() { + return getFilteredComponents("ajaxMisc"); + } + + public List getRichMisc() { + return getFilteredComponents("richMisc"); + } + + public List getComponents() { + Iterator it = components_().iterator(); + ComponentDescriptor cur = getCurrentComponent(); + while (it.hasNext()) { + ComponentDescriptor desc = (ComponentDescriptor) it.next(); + if (desc.equals(cur)) { + desc.setCurrent(true); + } else { + desc.setCurrent(false); + } + } + return components; + } + + public void setComponents(List components) { + this.components = components; + } + + private void loadComponents() { + Properties props = new Properties(); + List temp = new ArrayList(); + try { + InputStream is = this.getClass().getClassLoader().getResourceAsStream( + "/org/richfaces/demo/common/components.properties"); + props.load(is); + } catch (Exception e) { + throw new FacesException(e); + } + Set entries = props.entrySet(); + Iterator it = entries.iterator(); + while (it.hasNext()) { + Map.Entry e = (Map.Entry) it.next(); + ComponentDescriptor desc = new ComponentDescriptor(); + desc.setId(e.getKey().toString().trim()); + StringTokenizer toc = new StringTokenizer(e.getValue().toString(), ","); + // #id=name,captionImage,iconImage,devGuideLocation,tldDocLocation,javaDocLocation + desc.setGroup(toc.nextToken().trim()); + desc.setName(toc.nextToken().trim()); + desc.setIconImage(toc.nextToken().trim()); + desc.setCaptionImage(toc.nextToken().trim()); + desc.setDevGuideLocation(toc.nextToken().trim()); + desc.setTldDocLocation(toc.nextToken().trim()); + desc.setJavaDocLocation(toc.nextToken().trim()); + desc.setDemoLocation(toc.nextToken().trim()); + temp.add(desc); + } + Collections.sort(temp, new Comparator() { + public int compare(Object o1, Object o2) { + ComponentDescriptor d1 = (ComponentDescriptor) o1; + ComponentDescriptor d2 = (ComponentDescriptor) o2; + return d1.getName().compareTo(d2.getName()); + } + }); + setComponents(temp); + setCurrentComponent((ComponentDescriptor) temp.get(0)); + } + + /** + * Invoked when example tab panel switched + * + * @param event + * a ValueChangeEvent object + */ + public void tabPanelSwitched(ValueChangeEvent event) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + String activeTab = getCurrentComponent().getActiveTab(); + ViewHandler viewHandler = facesContext.getApplication().getViewHandler(); + String viewId = facesContext.getViewRoot().getViewId(); + String actionURL = viewHandler.getActionURL(facesContext, viewId); + String tabParam = "tab=" + activeTab; + actionURL.replaceAll("[\\?]tab=[\\w]*", "?" + tabParam); + actionURL.replaceAll("[&]tab=[\\w]*", "&" + tabParam); + if (!actionURL.contains(tabParam)) { + if (actionURL.contains("?")) { + actionURL += "&"; + } else { + actionURL += "?"; + } + actionURL += tabParam; + } + try { + facesContext.getExternalContext().redirect(actionURL); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -8,7 +8,8 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Calendar</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/calendar/usage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -8,7 +8,8 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Rich Effects</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/effect/usage.xhtml"/> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -8,7 +8,8 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Table Filtering Feature</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Built-In Filtering Usage"> <ui:include src="/richfaces/filteringFeature/filteringUsage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -10,7 +10,8 @@ <ui:define name="current">panel</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" headerClass="header_tabs_class" contentClass="content_tab" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/panel/usage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -8,7 +8,8 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Table Sorting Feature</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Built-in Sorting Feature"> <ui:include src="/richfaces/sortingFeature/sortingUsage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -8,7 +8,8 @@ <ui:define name="title">RichFaces - Open Source Rich JSF Components - TabPanel</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/tabPanel/usage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -10,7 +10,8 @@ <ui:define name="current">panel</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/toolTip/usage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-06-16 15:48:51 UTC (rev 9059) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-06-16 16:12:20 UTC (rev 9060) @@ -10,7 +10,8 @@ <ui:define name="current">panel</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" - inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}"> + inactiveTabClass="inactive_tab" activeTabClass="active_tab" selectedTab="#{componentNavigator.currentComponent.activeTab}" + valueChangeListener="#{componentNavigator.tabPanelSwitched}"> <rich:tab name="usage" label="Usage"> <ui:include src="/richfaces/tree/usage.xhtml" /> </rich:tab> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/tab-panel.xhtml =================================================================== (Binary files differ)

16 years

1
0
0 / 0

JBoss Rich Faces SVN: r9059 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: atsebro Date: 2008-06-16 11:48:51 -0400 (Mon, 16 Jun 2008) New Revision: 9059 Modified: trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml Log: RF-3518--Tooltip hideEvent attribute value Modified: trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2008-06-16 15:29:14 UTC (rev 9058) +++ trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2008-06-16 15:48:51 UTC (rev 9059) @@ -72,15 +72,15 @@ <section> <title>Details of Usage</title> <para> - To specify text information, labeled on a <property>tooltip</property>, use <emphasis><property>"value"</property></emphasis> attribute. - Images, links, buttons and other RichFaces components also may be put and composed inside <property>tooltip</property>. + To specify text information, labeled on a <emphasis role="bold"><property><rich:toolTip></property></emphasis>, use <emphasis><property>"value"</property></emphasis> attribute. + Images, links, buttons and other RichFaces components also may be put and composed inside <emphasis role="bold"><property><rich:toolTip></property></emphasis>. Text, specified between <property>tooltip's</property> start and end tags will be rendered in browser as simple text. - <property>Tooltip</property> borders stretch to enclose it contents. + <emphasis role="bold"><property><rich:toolTip></property></emphasis> borders stretch to enclose it contents. </para> <para> - There are three ways to attach a <property>tooltip</property> to a page element. + There are three ways to attach a <emphasis role="bold"><property><rich:toolTip></property></emphasis> to a page element. One of them uses nesting (this way is shown on example <link linkend="tab_ccpt">above</link>). - In such cases <property>tooltip</property> is attached to the parent component by default. + In such cases <emphasis role="bold"><property><rich:toolTip></property></emphasis> is attached to the parent component by default. </para> <note> <title>Note:</title> @@ -95,7 +95,7 @@ </para> </note> <para> - <property>Tooltip</property> may be attached to a page element by the use of <emphasis><property>"for"</property></emphasis> attribute. In this case a <property>tooltip</property> may be defined separately from a page element it is applied to. + <emphasis role="bold"><property><rich:toolTip></property></emphasis> may be attached to a page element by the use of <emphasis><property>"for"</property></emphasis> attribute. In this case a <emphasis role="bold"><property><rich:toolTip></property></emphasis> may be defined separately from a page element it is applied to. <emphasis><property>"id"</property></emphasis> for page element is necessary (see the example below). </para> <para> @@ -128,10 +128,10 @@ ... ]]></programlisting> <para> - <property>Tooltip</property> may also be invoked by JS API function. + <emphasis role="bold"><property><rich:toolTip></property></emphasis> may also be invoked by JS API function. List of JS API functions available for <emphasis role="bold"><property><rich:toolTip></property></emphasis> is listed <link linkend="tab_jsapi">below</link>. - JS API functions are defined for a page element, the <property>tooltip</property> is applied to. So, <property>tooltip</property> can be defined separately from that page element. - It is necessary to specify <emphasis><property>"ids"</property></emphasis> for both and set <property>tooltip</property> <emphasis><property>"attached"</property></emphasis> attribute's value to <emphasis><property>"false"</property></emphasis> (see the example below). + JS API functions are defined for a page element, the <emphasis role="bold"><property><rich:toolTip></property></emphasis> is applied to. So, <emphasis role="bold"><property><rich:toolTip></property></emphasis> can be defined separately from that page element. + It is necessary to specify <emphasis><property>"ids"</property></emphasis> for both and set <emphasis role="bold"><property><rich:toolTip></property></emphasis> <emphasis><property>"attached"</property></emphasis> attribute's value to <emphasis><property>"false"</property></emphasis> (see the example below). </para> <programlisting role="XML"><![CDATA[... <rich:panel id="paneld" onclick="#{rich:component("tooltipId")}.show();"> @@ -141,11 +141,11 @@ ... ]]></programlisting> <para> - The <emphasis><property>"mode"</property></emphasis> attribute is provided you to control the way of data loading to <property>tooltip</property>. + The <emphasis><property>"mode"</property></emphasis> attribute is provided you to control the way of data loading to <emphasis role="bold"><property><rich:toolTip></property></emphasis>. The component works properly in client and Ajax modes. - In client mode <property>toolTip</property> content is rendered once on the server and could be rerendered only via external submit. - In Ajax mode <property>toolTip</property> content is requested from server for every activation. - For Ajax mode there is possibility to define a facet <code>"defaultContent"</code>, which provides default <property>tooltip</property> content to be displayed, while main content is loading into the <property>tooltip</property> (see the example below). + In client mode <emphasis role="bold"><property><rich:toolTip></property></emphasis> content is rendered once on the server and could be rerendered only via external submit. + In Ajax mode <emphasis role="bold"><property><rich:toolTip></property></emphasis> content is requested from server for every activation. + For Ajax mode there is possibility to define a facet <code>"defaultContent"</code>, which provides default <emphasis role="bold"><property><rich:toolTip></property></emphasis> content to be displayed, while main content is loading into the <emphasis role="bold"><property><rich:toolTip></property></emphasis> (see the example below). </para> <para> <emphasis role="bold">Example:</emphasis> @@ -175,7 +175,7 @@ </figure> <para> - And after <property>toolTip</property> loaded it is changed to next one: + And after <emphasis role="bold"><property><rich:toolTip></property></emphasis> loaded it is changed to next one: </para> <figure> @@ -188,18 +188,27 @@ </figure> <para> - <property>toolTip</property> appears attached to the corner dependent on the <emphasis><property>"direction"</property></emphasis> attribute. + <emphasis role="bold"><property><rich:toolTip></property></emphasis> appears attached to the corner + dependent on the <emphasis><property>"direction"</property></emphasis> attribute. By default it is positioned bottom-right. - <property>toolTip</property> activation occurs after an event, defined on the parent component, takes into consideration the "delay" attribute or after calling JS API function <code>show()</code>. - <property>toolTip</property> deactivation occurs after <emphasis>mouseout</emphasis> event on the parent component (excepting the situation when the mouse is hovered onto the <property>tooltip</property> itself) or after calling JS API function <code>hide()</code>. - </para> + <emphasis role="bold"><property><rich:toolTip></property></emphasis> activation occurs after an event, + defined on the parent component, takes into consideration the "delay" attribute + or after calling JS API function <code>show()</code>. + <emphasis><property>"hideEvent"</property></emphasis> attribute defines the way + how <emphasis role="bold"><property><rich:toolTip></property></emphasis> disappears. + It default value is <emphasis><property>"none"</property></emphasis>, so the <emphasis role="bold"><property><rich:toolTip></property></emphasis> does not dissapears. + Deactivation may be set for example on <emphasis>mouseout</emphasis> event on the parent component + (excepting the situation when the mouse is hovered onto the + <emphasis role="bold"><property><rich:toolTip></property></emphasis> itself) + or after calling JS API function <code>hide()</code>. + </para> <para> - By default, <property>tooltip</property> appears smart positioned. But as you can see from the previous example, you + By default, <emphasis role="bold"><property><rich:toolTip></property></emphasis> appears smart positioned. But as you can see from the previous example, you can define an appearance direction via the corresponding attribute <emphasis><property>"direction"</property></emphasis>. And also it's possible to define vertical and horizontal offsets relatively to a mouse position. </para> <para> - Disabled <property>tooltip</property> is rendered to a page as usual but JS that responds for its activation is disabled until <code>enable()</code> is called. + Disabled <emphasis role="bold"><property><rich:toolTip></property></emphasis> is rendered to a page as usual but JS that responds for its activation is disabled until <code>enable()</code> is called. </para> <para> Moreover, to add some JavaScript effects, client events defined on it are used:

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2008