JBoss Rich Faces SVN: r13794 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-04-23 08:54:58 -0400 (Thu, 23 Apr 2009)
New Revision: 13794
Modified:
trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
Log:
https://jira.jboss.org/jira/browse/RF-398 English is checked and corrected in colorPicker and layout components description
Modified: trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-23 12:54:00 UTC (rev 13793)
+++ trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-23 12:54:58 UTC (rev 13794)
@@ -69,13 +69,13 @@
<title>Details of Usage</title>
<para>The <emphasis role="bold"><property><rich:page></property></emphasis>
- component together with the <emphasis role="bold"><property><rich:laout></property></emphasis> component provide
+ component together with the <emphasis role="bold"><property><rich:laout></property></emphasis> component provides
a full-fledged mechanism for markup creation. </para>
<para>
- In the first place, to declare the document type of the page you should use the <emphasis><property>"markupType"</property></emphasis> attribute which has the following values:
+ First of all, to declare the document type of the page you should use the <emphasis><property>"markupType"</property></emphasis> attribute which has the following values:
</para>
<itemizedlist>
15 years, 8 months
JBoss Rich Faces SVN: r13793 - trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-04-23 08:54:00 -0400 (Thu, 23 Apr 2009)
New Revision: 13793
Modified:
trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
Log:
RF-6909
Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
===================================================================
--- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-04-23 12:32:01 UTC (rev 13792)
+++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-04-23 12:54:00 UTC (rev 13793)
@@ -109,7 +109,7 @@
selenium.type(HtmlConstants.LoginPage.passwordId, UserInfoConstants.LOGIN_PASSWORD);
selenium.click(HtmlConstants.LoginPage.loginButtonPath);
- selenium.waitForPageToLoad("10000");
+ waitForAjaxCompletion(selenium);
if (!isLogined(selenium, UserInfoConstants.LOGIN_NAME)) {
Assert.fail("Authentication was not succesfull. Logged user text should contain typed login name");
@@ -167,10 +167,8 @@
public static void openImageFromAlbumArea(Selenium selenium) {
String imageName = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_NAME_PATH);
-
selenium.click(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_LINK_PATH);
waitForAjaxCompletion(selenium);
-
testImageArea(selenium, imageName);
}
15 years, 8 months
JBoss Rich Faces SVN: r13792 - trunk/ui/colorPicker/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-04-23 08:32:01 -0400 (Thu, 23 Apr 2009)
New Revision: 13792
Modified:
trunk/ui/colorPicker/src/main/config/component/colorPicker.xml
Log:
https://jira.jboss.org/jira/browse/RF-6845 - the descriptions for the onbeforeshow, onchange, onselect, onshow and onhide attributes are added;
Modified: trunk/ui/colorPicker/src/main/config/component/colorPicker.xml
===================================================================
--- trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-04-23 12:23:48 UTC (rev 13791)
+++ trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-04-23 12:32:01 UTC (rev 13792)
@@ -77,22 +77,27 @@
<property>
<name>onselect</name>
<classname>java.lang.String</classname>
+ <description>The clientside script method to be called when the color is selected</description>
</property>
<property>
<name>onchange</name>
<classname>java.lang.String</classname>
+ <description>The clientside script method to be called when the element value was changed</description>
</property>
<property>
<name>onbeforeshow</name>
<classname>java.lang.String</classname>
+ <description>The clientside script method to be called before the element is open</description>
</property>
<property>
<name>onshow</name>
<classname>java.lang.String</classname>
+ <description>The clientside script method to be called when the element is open</description>
</property>
<property>
<name>onhide</name>
<classname>java.lang.String</classname>
+ <description>The clientside script method to be called before the element is hidden</description>
</property>
</component>
15 years, 8 months
JBoss Rich Faces SVN: r13791 - trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-04-23 08:23:48 -0400 (Thu, 23 Apr 2009)
New Revision: 13791
Modified:
trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml
Log:
Correct sorting
Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2009-04-23 11:10:04 UTC (rev 13790)
+++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2009-04-23 12:23:48 UTC (rev 13791)
@@ -70,7 +70,7 @@
<f:facet name="header">
<h:outputText value="facet header"></h:outputText>
</f:facet>
- <rich:column sortBy="#{sdt.int0}" sortable="true" id="colID">
+ <rich:column sortExpression="#{sdt.int0}" sortable="true" id="colID">
<f:facet name="header">
<h:outputText value="#" />
</f:facet>
@@ -80,7 +80,7 @@
</f:facet>
</rich:column>
- <rich:column sortBy="#{sdt.str0}" sortable="false">
+ <rich:column sortExpression="#{sdt.str0}" sortable="false">
<f:facet name="header">
<h:outputText value="Text"></h:outputText>
</f:facet>
@@ -90,7 +90,7 @@
</f:facet>
</rich:column>
- <rich:column sortBy="#{sdt.str1}">
+ <rich:column sortExpression="#{sdt.str1}">
<f:facet name="header">
<h:outputText value="Link"></h:outputText>
</f:facet>
@@ -100,7 +100,7 @@
</f:facet>
</rich:column>
- <rich:column sortBy="#{sdt.str2}">
+ <rich:column sortExpression="#{sdt.str2}">
<f:facet name="header">
<h:outputText value="Select"></h:outputText>
</f:facet>
@@ -116,7 +116,7 @@
</f:facet>
</rich:column>
- <rich:column sortBy="#{sdt.str3}">
+ <rich:column sortExpression="#{sdt.str3}">
<f:facet name="header">
<h:outputText value="Icon"></h:outputText>
</f:facet>
@@ -138,7 +138,7 @@
</f:facet>
</rich:column>
- <rich:column sortBy="#{sdt.date0}" sortable="true">
+ <rich:column sortExpression="#{sdt.date0}" sortable="true">
<f:facet name="header">
<h:outputText value="Date" />
</f:facet>
15 years, 8 months
JBoss Rich Faces SVN: r13790 - in trunk/samples/richfaces-demo/src/main/webapp: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-23 07:10:04 -0400 (Thu, 23 Apr 2009)
New Revision: 13790
Modified:
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/components.xml
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6671
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/components.xml 2009-04-23 10:43:33 UTC (rev 13789)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/components.xml 2009-04-23 11:10:04 UTC (rev 13790)
@@ -18,7 +18,7 @@
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
- <core:init debug="true" transaction-management-enabled="false"/>
+ <core:init debug="false" transaction-management-enabled="false"/>
<transaction:no-transaction/>
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2009-04-23 10:43:33 UTC (rev 13789)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2009-04-23 11:10:04 UTC (rev 13790)
@@ -52,7 +52,10 @@
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
<param-value>enable</param-value>
</context-param>
-
+ <context-param>
+ <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name>
+ <param-value>true</param-value>
+ </context-param>
<context-param>
<param-name>org.richfaces.LoadStyleStrategy</param-name>
<param-value>ALL</param-value>
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2009-04-23 10:43:33 UTC (rev 13789)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/main.xhtml 2009-04-23 11:10:04 UTC (rev 13790)
@@ -14,6 +14,15 @@
<link rel="STYLESHEET" type="text/css" href="${facesContext.externalContext.requestContextPath}/css/common.css"/>
<ui:include src="/templates/include/dynamic-css.xhtml" />
+<script>
+A4J.AJAX.onExpired = function(loc, expiredMsg){
+ if(window.confirm(expiredMsg)){
+ return loc;
+ } else {
+ return false;
+ }
+}
+</script>
</head>
<body>
15 years, 8 months
JBoss Rich Faces SVN: r13789 - in trunk/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-23 06:43:33 -0400 (Thu, 23 Apr 2009)
New Revision: 13789
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/customScroller.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6576
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-04-23 10:38:52 UTC (rev 13788)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-04-23 10:43:33 UTC (rev 13789)
@@ -12,6 +12,8 @@
import java.util.Random;
import java.util.Set;
+import javax.faces.model.SelectItem;
+
import org.richfaces.component.UIScrollableDataTable;
import org.richfaces.demo.datafilterslider.DemoInventoryItem;
import org.richfaces.model.SortField;
@@ -27,6 +29,16 @@
private DemoInventoryItem currentItem = new DemoInventoryItem();
+ private int rows = 10;
+
+ public int getRows() {
+ return rows;
+ }
+
+ public void setRows(int rows) {
+ this.rows = rows;
+ }
+
private Set<Integer> keys = new HashSet<Integer>();
private int currentRow;
@@ -103,6 +115,18 @@
return allCars;
}
+ public List<SelectItem> getPagesToScroll() {
+ List<SelectItem> list = new ArrayList<SelectItem>();
+ for (int i = 0; i <=allCars.size()/getRows(); i++) {
+ if (Math.abs(i-scrollerPage) < 5){
+ SelectItem item = new SelectItem(i);
+ if (scrollerPage==i) item.setDisabled(true);
+ list.add(item);
+ }
+ }
+ return list;
+ }
+
public List<DemoInventoryItem> getTenRandomCars() {
List<DemoInventoryItem> result = new ArrayList<DemoInventoryItem>();
int size = getAllCars().size()-1;
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-04-23 10:38:52 UTC (rev 13788)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-04-23 10:43:33 UTC (rev 13789)
@@ -29,7 +29,7 @@
togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, togglePanel.html, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf
panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, panelMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf
suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, suggestionbox.html, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf
-dataTableScroller= richDataIterators, Data Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, datascroller.html, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf
+dataTableScroller= richDataIterators, Data Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, datascroller.html, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf, new
dropDownMenu= richMenu, Drop Down Menu, /images/ico_DropDownMenu.gif, /images/cn_DropDownMenu.gif, dropDownMenu.html, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf
menuGroup= richMenu, Menu Group, /images/ico_MenuGroup.gif, /images/cn_MenuGroup.gif, menuGroup.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuGroup.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuGroup.html, /richfaces/dropDownMenu.jsf
menuItem= richMenu, Menu Item, /images/ico_MenuItem.gif, /images/cn_MenuItem.gif, menuItem.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuItem.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/customScroller.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/customScroller.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/customScroller.xhtml 2009-04-23 10:43:33 UTC (rev 13789)
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+ <p>
+ This sample designed to show how to use <b>datascroller</b> component
+ <b>facets</b> for component look and feel and functionality <b>customization</b>.
+ </p>
+ <p>
+ As you could see the <b>datascroller</b> has customized step controls
+ and default buttons changes to select which allows to switch to
+ four pages nearest to current one.
+ </p>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Data Scroller customization</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/dataTableScroller/examples/customScroller.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/dataTableScroller/examples/customScroller.xhtml"/>
+ <ui:param name="openlabel" value="View Source" />
+ </ui:include>
+ </div>
+ </fieldset>
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml 2009-04-23 10:43:33 UTC (rev 13789)
@@ -0,0 +1,87 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <style>
+.scrollerCell {
+ padding-right: 10px;
+ padding-left: 10px;
+}
+</style>
+ <h:form>
+ <rich:dataTable width="483" id="carList"
+ rows="#{dataTableScrollerBean.rows}" columnClasses="col"
+ value="#{dataTableScrollerBean.allCars}" var="category">
+ <f:facet name="header">
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="Make" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="Model" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="Price" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="Mileage" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+ <rich:column>
+ <h:outputText value="#{category.make}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{category.model}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{category.price}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{category.mileage}" />
+ </rich:column>
+ <f:facet name="footer">
+ <rich:datascroller maxPages="20" fastControls="hide"
+ page="#{dataTableScrollerBean.scrollerPage}" pagesVar="pages"
+ id="ds">
+ <f:facet name="first">
+ <h:outputText value="First" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="first_disabled">
+ <h:outputText value="First" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="last">
+ <h:outputText value="Last" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="last_disabled">
+ <h:outputText value="Last" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="previous">
+ <h:outputText value="Previous" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="previous_disabled">
+ <h:outputText value="Previous" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="next">
+ <h:outputText value="Next" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="next_disabled">
+ <h:outputText value="Next" styleClass="scrollerCell" />
+ </f:facet>
+ <f:facet name="pages">
+ <h:panelGroup>
+ <h:outputText value="Page " />
+ <h:selectOneMenu value="#{dataTableScrollerBean.scrollerPage}"
+ onchange="#{rich:component('ds')}.switchToPage(this.value)">
+ <f:selectItems value="#{dataTableScrollerBean.pagesToScroll}" />
+ </h:selectOneMenu>
+ <h:outputText value=" of #{pages}" />
+ </h:panelGroup>
+ </f:facet>
+ </rich:datascroller>
+ </f:facet>
+ </rich:dataTable>
+ </h:form>
+</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2009-04-23 10:38:52 UTC (rev 13788)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2009-04-23 10:43:33 UTC (rev 13789)
@@ -7,7 +7,20 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table Scroller</ui:define>
<ui:define name="body">
- <ui:include src="/templates/include/tab-panel.xhtml" />
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"
+ selectedTab="#{componentNavigator.currentComponent.activeTab}" valueChangeListener="#{componentNavigator.tabPanelSwitched}">
+ <rich:tab label="Usage" name="usage">
+ <ui:include src="/richfaces/dataTableScroller/usage.xhtml"/>
+ </rich:tab>
+ <rich:tab label="Scroller Facets Usage" name="scrollerfacets">
+ <ui:include src="/richfaces/dataTableScroller/customScroller.xhtml"/>
+ </rich:tab>
+ <rich:tab name="info" label="Tag Information">
+ <rich:insert
+ src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}"
+ errorContent="/templates/include/tagInfoNotes.xhtml" />
+ </rich:tab>
+ </rich:tabPanel>
</ui:define>
</ui:composition>
</html>
15 years, 8 months
JBoss Rich Faces SVN: r13788 - in trunk/test-applications/regressionArea: regressionArea-ejb/src/main/resources/META-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-23 06:38:52 -0400 (Thu, 23 Apr 2009)
New Revision: 13788
Modified:
trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF
trunk/test-applications/regressionArea/regressionArea-web/pom.xml
trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/RF-6894
Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 10:10:17 UTC (rev 13787)
+++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 10:38:52 UTC (rev 13788)
@@ -139,7 +139,7 @@
<zipUrlInstaller>
<url>${jboss.installer.url}</url>
<installDir>
- ${project.basedir}/target/installs
+ ${jboss.install.dir}
</installDir>
</zipUrlInstaller>
</container>
@@ -167,8 +167,9 @@
</build>
<properties>
+ <jboss.install.dir>${project.basedir}/target/installs</jboss.install.dir>
<jboss.version>4.2.3.GA</jboss.version>
- <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome>
+ <jbosshome>${jboss.install.dir}/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome>
<jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url>
</properties>
Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:10:17 UTC (rev 13787)
+++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:38:52 UTC (rev 13788)
@@ -1,10 +1,6 @@
Manifest-Version: 1.0
Class-Path: bsh-1.3.0.jar commons-beanutils-1.7.0.jar commons-collecti
- ons-3.2.jar commons-digester-2.0.jar commons-lang-2.3.jar commons-log
- ging-1.0.4.jar dom4j-1.6.1-brew.jar el-api-1.0.jar jboss-el-1.0_02.CR
- 2.jar jboss-seam-2.1.1.GA.jar jboss-seam-debug-2.1.1.GA.jar jboss-sea
- m-jul-2.1.1.GA.jar jboss-seam-remoting-2.1.1.GA.jar jboss-seam-ui-2.1
- .1.GA.jar jsf-api-1.2_11.jar jsf-facelets-1.1.15.B1.jar jsf-impl-1.2_
- 11.jar log4j-1.2.14.jar richfaces-api-3.3.1-SNAPSHOT.jar richfaces-im
- pl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar
+ ons-3.2.jar commons-lang-2.3.jar commons-logging-1.0.4.jar el-api-1.0
+ .jar jboss-el-1.0_02.CR2.jar jboss-seam-2.1.1.GA.jar log4j-1.2.14.jar
+ richfaces-api-3.3.1-SNAPSHOT.jar
Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 10:10:17 UTC (rev 13787)
+++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 10:38:52 UTC (rev 13788)
@@ -22,6 +22,16 @@
<artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
@@ -67,6 +77,14 @@
<artifactId>jboss-seam</artifactId>
<groupId>org.jboss.seam</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:10:17 UTC (rev 13787)
+++ trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2009-04-23 10:38:52 UTC (rev 13788)
@@ -1,4 +1,6 @@
Manifest-Version: 1.0
-Class-Path: commons-digester-2.0.jar jsf-facelets-1.1.14.jar richfaces
- -impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar
+Class-Path: commons-beanutils-1.7.0.jar commons-digester-2.0.jar jboss
+ -seam-debug-2.1.1.GA.jar jboss-seam-jul-2.1.1.GA.jar jboss-seam-remot
+ ing-2.1.1.GA.jar jboss-seam-ui-2.1.1.GA.jar jsf-facelets-1.1.15.B1.ja
+ r richfaces-impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar
15 years, 8 months
JBoss Rich Faces SVN: r13787 - in trunk/ui/menu-components/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-23 06:10:17 -0400 (Thu, 23 Apr 2009)
New Revision: 13787
Modified:
trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
https://jira.jboss.org/jira/browse/RF-6908
Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-04-23 10:07:32 UTC (rev 13786)
+++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-04-23 10:10:17 UTC (rev 13787)
@@ -16,7 +16,8 @@
new org.ajax4jsf.javascript.AjaxScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/ajax4jsf/javascript/scripts/form.js,
- /org/richfaces/renderkit/html/scripts/form.js
+ /org/richfaces/renderkit/html/scripts/form.js,
+ /org/richfaces/renderkit/html/scripts/menu.js
</h:scripts>
<jsp:scriptlet>
Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2009-04-23 10:07:32 UTC (rev 13786)
+++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2009-04-23 10:10:17 UTC (rev 13787)
@@ -70,6 +70,7 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js");
javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/form.js");
+ javaScripts.add("org/richfaces/renderkit/html/scripts/menu.js");
}
private UIMenuItem menuItem;
15 years, 8 months
JBoss Rich Faces SVN: r13786 - trunk/examples/photoalbum/web/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-23 06:07:32 -0400 (Thu, 23 Apr 2009)
New Revision: 13786
Modified:
trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
Log:
Correct error message for date field
Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-23 00:36:53 UTC (rev 13785)
+++ trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-23 10:07:32 UTC (rev 13786)
@@ -44,9 +44,9 @@
javax.faces.converter.CharacterConverter.CHARACTER=value must be a character
javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character
javax.faces.converter.DateTimeConverter.DATE=value must be a date
-javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1}
+javax.faces.converter.DateTimeConverter.DATE_detail=Invalid date format, eg. {1}
javax.faces.converter.DateTimeConverter.TIME=value must be a time
-javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1}
+javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1}
javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time
javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1}
javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value
15 years, 8 months
JBoss Rich Faces SVN: r13785 - in trunk/test-applications/regressionArea: regressionArea-ejb and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-22 20:36:53 -0400 (Wed, 22 Apr 2009)
New Revision: 13785
Modified:
trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml
trunk/test-applications/regressionArea/regressionArea-web/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-6894
Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-22 20:52:21 UTC (rev 13784)
+++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-04-23 00:36:53 UTC (rev 13785)
@@ -28,38 +28,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${seamversion}</version>
- <type>jar</type>
- <exclusions>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>regressionArea-ejb</artifactId>
<version>${project.version}</version>
@@ -85,10 +53,10 @@
<artifactId>javassist</artifactId>
<groupId>jboss</groupId>
</exclusion>
- <exclusion>
+ <!--exclusion>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- </exclusion>
+ </exclusion-->
<!--exclusion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
@@ -199,15 +167,16 @@
</build>
<properties>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
- <jboss.installer.url>file:Y:\Distribs\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jboss.version>4.2.3.GA</jboss.version>
+ <jbosshome>${project.basedir}/target/installs/jboss-${jboss.version}/jboss-${jboss.version}</jbosshome>
+ <jboss.installer.url>file:F:\Distribs\jboss-${jboss.version}.zip</jboss.installer.url>
</properties>
<profiles>
<profile>
<id>hudson</id>
<properties>
- <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-${jboss.versio...</jboss.installer.url>
</properties>
</profile>
</profiles>
Modified: trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-04-22 20:52:21 UTC (rev 13784)
+++ trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-04-23 00:36:53 UTC (rev 13785)
@@ -12,51 +12,21 @@
<packaging>ejb</packaging>
<dependencies>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsfversion}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsfversion}</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>${richversion}</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${richversion}</version>
- </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsfversion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${richversion}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-remoting</artifactId>
+ <artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
- <exclusions>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- <version>${seamversion}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- <version>${seamversion}</version>
- </dependency>
<dependency>
<groupId>log4j</groupId>
Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-22 20:52:21 UTC (rev 13784)
+++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2009-04-23 00:36:53 UTC (rev 13785)
@@ -17,6 +17,12 @@
<version>${richversion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seamversion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
@@ -46,8 +52,45 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
+ <version>1.1.15.B1</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-remoting</artifactId>
+ <version>${seamversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>jboss</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seamversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>${seamversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<finalName>regressionArea-web</finalName>
15 years, 8 months