November 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r16004 - in branches/community/3.3.X/samples: glassX and 4 other directories.

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

Author: nbelaevski Date: 2009-11-25 17:51:59 -0500 (Wed, 25 Nov 2009) New Revision: 16004 Modified: branches/community/3.3.X/samples/darkX/pom.xml branches/community/3.3.X/samples/glassX/pom.xml branches/community/3.3.X/samples/laguna/pom.xml branches/community/3.3.X/samples/skins/pom.xml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/samples/violetRays/pom.xml Log: Configuration updated for JSF2 Modified: branches/community/3.3.X/samples/darkX/pom.xml =================================================================== --- branches/community/3.3.X/samples/darkX/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/darkX/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -32,18 +32,39 @@ </plugin> </plugins> </build> - <dependencies> + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> + <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Modified: branches/community/3.3.X/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/glassX/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -33,6 +33,32 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> <dependencies> <dependency> <groupId>junit</groupId> @@ -40,11 +66,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Modified: branches/community/3.3.X/samples/laguna/pom.xml =================================================================== --- branches/community/3.3.X/samples/laguna/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/laguna/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -23,14 +23,36 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> <dependencies> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Modified: branches/community/3.3.X/samples/skins/pom.xml =================================================================== --- branches/community/3.3.X/samples/skins/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/skins/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -8,13 +8,34 @@ <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <name>skins</name> + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> <dependencies> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/themes/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -36,6 +36,34 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> + <dependencies> <dependency> <groupId>junit</groupId> @@ -48,11 +76,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> Modified: branches/community/3.3.X/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-25 20:52:11 UTC (rev 16003) +++ branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-25 22:51:59 UTC (rev 16004) @@ -28,6 +28,32 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <classifier>jsf2</classifier> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> <dependencies> <dependency> <groupId>junit</groupId> @@ -35,11 +61,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <scope>provided</scope>

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r16003 - in branches/community/3.3.X/ui/menu-components/src/main: templates/org/richfaces and 1 other directory.

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

Author: nbelaevski Date: 2009-11-25 15:52:11 -0500 (Wed, 25 Nov 2009) New Revision: 16003 Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx Log: Optimization changes in menuItem renderer: new JSONObject() replaced with ScriptUtils Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-25 20:39:36 UTC (rev 16002) +++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-25 20:52:11 UTC (rev 16003) @@ -49,7 +49,6 @@ import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; import org.richfaces.renderkit.CompositeRenderer; -import org.richfaces.json.JSONObject; public class MenuItemRendererBase extends CompositeRenderer { @@ -356,7 +355,7 @@ delegate.initializeStyles(context, menuItem, menuItem.isDisabled(), variables); } - public static String toJson(Map map) { - return new JSONObject(map).toString(); + public String toScript(Map<?, ?> map) { + return ScriptUtils.toScript(map); } } Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-25 20:39:36 UTC (rev 16002) +++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-25 20:52:11 UTC (rev 16003) @@ -82,8 +82,8 @@ <div id="#{clientId}" class="#{menuItemClass}" - onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{this:toJson(onmouseoutClasses)});" - onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{this:toJson(onmouseoverClasses)});" + onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{this:toScript(onmouseoutClasses)});" + onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{this:toScript(onmouseoverClasses)});" onclick="#{onclick}" style="#{menuItemStyle}"> <f:call name="utils.encodeAttributes">

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r16002 - branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit.

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

Author: nbelaevski Date: 2009-11-25 15:39:36 -0500 (Wed, 25 Nov 2009) New Revision: 16002 Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: Fixed improper usage of ResponseWriter in CalendarRendererBase Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-25 19:39:53 UTC (rev 16001) +++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-25 20:39:36 UTC (rev 16002) @@ -21,47 +21,62 @@ package org.richfaces.renderkit; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.text.DateFormatSymbols; +import java.text.Format; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; + +import javax.el.ValueExpression; +import javax.faces.application.Application; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.convert.DateTimeConverter; +import javax.faces.event.PhaseId; + import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.event.AjaxEvent; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.javascript.JSLiteral; import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.RendererUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.richfaces.component.TemplateComponent; import org.richfaces.component.UICalendar; import org.richfaces.component.util.ComponentUtil; import org.richfaces.component.util.MessageUtil; import org.richfaces.context.RequestContext; import org.richfaces.event.CurrentDateChangeEvent; -import org.richfaces.json.JSONObject; -import javax.el.ValueExpression; -import javax.faces.application.Application; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.convert.DateTimeConverter; -import javax.faces.event.PhaseId; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.text.DateFormatSymbols; -import java.text.Format; -import java.text.SimpleDateFormat; -import java.util.*; - /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 * */ public class CalendarRendererBase extends TemplateEncoderRendererBase { + /** + * + */ + private static final String MARKUP_PARAMETER_SUFFIX = "Markup"; + protected static final String MONTH_LABELS_SHORT = "monthLabelsShort"; protected static final String MONTH_LABELS = "monthLabels"; @@ -89,8 +104,6 @@ public static final String CURRENT_DATE_PRELOAD = "PreloadCurrentDate"; - protected static final String MARKUP_SUFFIX = "Markup"; - public static final String CALENDAR_BUNDLE = "org.richfaces.renderkit.calendar"; private static final String LOCALES_KEY = "rich:locales"; @@ -449,9 +462,10 @@ } public void writeFacetMarkup(FacesContext context, UIComponent component) throws IOException { - Map<String, String> jsonMap = new HashMap(); + Map<String, JSLiteral> jsonMap = new HashMap<String, JSLiteral>(); if (component.getChildCount() != 0) { - jsonMap.put("dayList", getMarkupScriptBody(context, component, true)); + String markupScriptBody = getMarkupScriptBody(context, component, true); + jsonMap.put("dayList" + MARKUP_PARAMETER_SUFFIX, new JSLiteral(markupScriptBody)); } addFacetMarkupScriptBody(context, component, jsonMap, "optionalHeader"); @@ -462,27 +476,14 @@ addFacetMarkupScriptBody(context, component, jsonMap, "header"); addFacetMarkupScriptBody(context, component, jsonMap, "footer"); - context.getResponseWriter().write("{"); - boolean isFirst = true; - for (Map.Entry<String, String> entry : jsonMap.entrySet()) { - if (isFirst) { - isFirst = false; - } else { - context.getResponseWriter().write(","); - } - context.getResponseWriter().write(entry.getKey() + MARKUP_SUFFIX); - context.getResponseWriter().write(":"); - context.getResponseWriter().write(entry.getValue()); - - } - context.getResponseWriter().write("}"); + context.getResponseWriter().writeText(ScriptUtils.toScript(jsonMap), null); } - private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, String> jsonMap, String facetName) throws IOException { + private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, JSLiteral> jsonMap, String facetName) throws IOException { String res = getOptionalFacetMarkupScriptBody(context, component, facetName); if (res != null) { - jsonMap.put(facetName, res); - } + jsonMap.put(facetName + MARKUP_PARAMETER_SUFFIX, new JSLiteral(res)); + } } public void writePreloadBody(FacesContext context, UICalendar calendar) @@ -490,7 +491,7 @@ Object preload = calendar.getPreload(); if (preload != null) { ResponseWriter writer = context.getResponseWriter(); - writer.write(ScriptUtils.toScript(preload)); + writer.writeText(ScriptUtils.toScript(preload), null); } }

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r16001 - in branches/community/3.3.X/test-applications: automator/src/main/webapp/WEB-INF and 8 other directories.

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

Author: nbelaevski Date: 2009-11-25 14:39:53 -0500 (Wed, 25 Nov 2009) New Revision: 16001 Modified: branches/community/3.3.X/test-applications/ajaxTest/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/automator/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/facelets/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/jsp/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/regression-test/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/web.xml branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml Log: Added javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER parameter for QA demos Modified: branches/community/3.3.X/test-applications/ajaxTest/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/ajaxTest/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/ajaxTest/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -21,6 +21,10 @@ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Modified: branches/community/3.3.X/test-applications/automator/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/automator/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/automator/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -22,6 +22,10 @@ <param-name>com.sun.faces.enableRestoreView11Compatibility</param-name> <param-value>true</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> <filter> <display-name>RichFaces Filter</display-name> <filter-name>richfaces</filter-name> Modified: branches/community/3.3.X/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -68,6 +68,10 @@ </param-name> <param-value>true</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> Modified: branches/community/3.3.X/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -65,6 +65,10 @@ <param-name>org.richfaces.queue.global.enabled</param-name> <param-value>false</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param>  <context-param> Modified: branches/community/3.3.X/test-applications/regression-test/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/regression-test/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -26,6 +26,10 @@ <param-name>org.richfaces.CONTROL_SKINNING</param-name> <param-value>enable</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> <filter> <display-name>RichFaces Filter</display-name> <filter-name>richfaces</filter-name> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -36,6 +36,10 @@ <param-value>com.sun.facelets.FaceletViewHandler</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> <context-param> Modified: branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -27,6 +27,10 @@ <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param>  <filter> Modified: branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/seamApp/web/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -81,6 +81,11 @@ <param-value>true</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -115,6 +115,10 @@ <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param>  Modified: branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml 2009-11-25 17:21:34 UTC (rev 16000) +++ branches/community/3.3.X/test-applications/test-jsp/src/main/webapp/WEB-INF/web.xml 2009-11-25 19:39:53 UTC (rev 16001) @@ -85,6 +85,11 @@ <param-value>false</param-value> </context-param> + <context-param> + <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name> + <param-value>true</param-value> + </context-param> + <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name>

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r16000 - in branches/community/3.3.X: framework/jsf-test and 3 other directories.

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

Author: nbelaevski Date: 2009-11-25 12:21:34 -0500 (Wed, 25 Nov 2009) New Revision: 16000 Modified: branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/framework/jsf-test/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml branches/community/3.3.X/ui/pom.xml Log: Downgraded NekoHTML to 1.9.6 Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2009-11-25 16:41:55 UTC (rev 15999) +++ branches/community/3.3.X/framework/impl/pom.xml 2009-11-25 17:21:34 UTC (rev 16000) @@ -211,9 +211,9 @@ <optional>true</optional> </dependency> <dependency> - <groupId>net.sourceforge.nekohtml</groupId> + <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.13</version> + <version>1.9.6</version> <exclusions> <exclusion> <groupId>xerces</groupId> Modified: branches/community/3.3.X/framework/jsf-test/pom.xml =================================================================== --- branches/community/3.3.X/framework/jsf-test/pom.xml 2009-11-25 16:41:55 UTC (rev 15999) +++ branches/community/3.3.X/framework/jsf-test/pom.xml 2009-11-25 17:21:34 UTC (rev 16000) @@ -69,9 +69,9 @@ <version>3.2.1</version> </dependency> <dependency> - <groupId>net.sourceforge.nekohtml</groupId> + <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.11</version> + <version>1.9.6</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-25 16:41:55 UTC (rev 15999) +++ branches/community/3.3.X/samples/pom.xml 2009-11-25 17:21:34 UTC (rev 16000) @@ -121,9 +121,9 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>net.sourceforge.nekohtml</groupId> + <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.13</version> + <version>1.9.6</version> <exclusions> <exclusion> <groupId>xerces</groupId> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-25 16:41:55 UTC (rev 15999) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-25 17:21:34 UTC (rev 16000) @@ -286,9 +286,9 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>net.sourceforge.nekohtml</groupId> + <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.13</version> + <version>1.9.6</version> <exclusions> <exclusion> <groupId>xerces</groupId> Modified: branches/community/3.3.X/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2009-11-25 16:41:55 UTC (rev 15999) +++ branches/community/3.3.X/ui/pom.xml 2009-11-25 17:21:34 UTC (rev 16000) @@ -212,9 +212,9 @@ <optional>true</optional> </dependency> <dependency> - <groupId>net.sourceforge.nekohtml</groupId> + <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.13</version> + <version>1.9.6</version> <exclusions> <exclusion> <groupId>xerces</groupId>

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15999 - root/framework/trunk/impl/src/main/resources/META-INF/resources.

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

Author: pyaschenko Date: 2009-11-25 11:41:55 -0500 (Wed, 25 Nov 2009) New Revision: 15999 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: ajax client library: queue: default requestDelay was set to 0 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-25 16:30:08 UTC (rev 15998) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-25 16:41:55 UTC (rev 15999) @@ -9,7 +9,7 @@ var QUEUE_MODE_PULL = 'pull'; var QUEUE_MODE_PUSH = 'push'; - var defaultQueueOptions = {mode: QUEUE_MODE_PULL, requestDelay:10000}; + var defaultQueueOptions = {mode: QUEUE_MODE_PULL, requestDelay:0}; richfaces.queue = function(opts){

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15998 - root/framework/trunk/impl/src/main/resources/META-INF/resources.

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

Author: pyaschenko Date: 2009-11-25 11:30:08 -0500 (Wed, 25 Nov 2009) New Revision: 15998 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js Log: ajax client library: queue: push model was added Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-25 16:01:59 UTC (rev 15997) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2009-11-25 16:30:08 UTC (rev 15998) @@ -7,6 +7,10 @@ richfaces.queue.push(source, event, options); }; + var QUEUE_MODE_PULL = 'pull'; + var QUEUE_MODE_PUSH = 'push'; + var defaultQueueOptions = {mode: QUEUE_MODE_PULL, requestDelay:10000}; + richfaces.queue = function(opts){ var queueEntry = function(query, event, options) { @@ -45,7 +49,7 @@ }, startTimer: function() { - var delay = this.options.requestDelay; + var delay = this.options.requestDelay || queueRequestDelay || 0; log.debug("Queue will wait " + (delay || 0) + "ms before submit"); @@ -98,6 +102,9 @@ var queueOptions = opts || {}; var last; + var queueMode = queueOptions.mode; + var queueRequestDelay = queueOptions.requestDelay; + var onError = function (data) { log.debug("richfaces.queue: ajax submit error"); last = null; @@ -116,7 +123,7 @@ jsf.ajax.addOnError(onError); var submitFirst = function() { - if (last) { + if (queueMode == QUEUE_MODE_PULL && last) { log.debug("richfaces.queue: Waiting for previous submit results"); return; } @@ -124,14 +131,16 @@ log.debug("richfaces.queue: Nothing to submit"); return; } - last = items.shift(); - if (last.readyToSubmit) { - log.debug("richfaces.queue: will submit request NOW"); - //last.query.appendParameter("AJAX:EVENTS_COUNT", last.eventsCount); - var params = richfaces.processRequestParams(last.query, last.options); - richfaces.ajax.request(last.query, last.event, params); - if (last.options.queueonsubmit) { - last.options.queueonsubmit.call(last); + if (items[0].readyToSubmit) { + last = items.shift(); + if (last.readyToSubmit) { + log.debug("richfaces.queue: will submit request NOW"); + //last.query.appendParameter("AJAX:EVENTS_COUNT", last.eventsCount); + var params = richfaces.processRequestParams(last.query, last.options); + richfaces.ajax.request(last.query, last.event, params); + if (last.options.queueonsubmit) { + last.options.queueonsubmit.call(last); + } } } }; @@ -183,14 +192,14 @@ items.push(entry); log.debug("New request added to queue. Queue similarityGroupingId changed to " + similarityGroupingId); + submitFirst(); } } else { items.push(entry); - log.debug("New request added to queue. Queue similarityGroupingId changed to " + similarityGroupingId); + log.debug("New request added to queue."); } + entry.startTimer(); - entry.startTimer(); - //submitFirst(); }, pop: function () { @@ -199,5 +208,5 @@ clear: function () { } } - }(); + }(jQuery.extend({},defaultQueueOptions)); }(jQuery, RichFaces, jsf)); \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15997 - in root/ui-sandbox/trunk/components/tables/ui/src/main: resources/META-INF/resources and 1 other directory.

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

Author: konstantin.mishin Date: 2009-11-25 11:01:59 -0500 (Wed, 25 Nov 2009) New Revision: 15997 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css Log: RF-7871 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-11-25 15:44:24 UTC (rev 15996) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-11-25 16:01:59 UTC (rev 15997) @@ -186,6 +186,9 @@ for (int i = 0; i < 2; i++) { if (columns.hasNext()) { writer.startElement(HTML.TD_ELEM, table); + if (i == 0 && "footer".equals(name)) { + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-footer-align", null); + } writer.startElement(HTML.DIV_ELEM, table); if (i == 0) { if ("header".equals(name)) { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-11-25 15:44:24 UTC (rev 15996) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-11-25 16:01:59 UTC (rev 15997) @@ -40,9 +40,9 @@ background-color : #CCCCCC; } -/*.rich-extable-footer table tbody tr{ +.rich-extable-footer-align{ vertical-align: top; -}*/ +} .rich-extable-part{ overflow: hidden;

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15996 - branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit.

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

Author: Alex.Kolonitsky Date: 2009-11-25 10:44:24 -0500 (Wed, 25 Nov 2009) New Revision: 15996 Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: https://jira.jboss.org/jira/browse/RF-8159 Demo: organizer example contains blank cells Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-25 15:08:55 UTC (rev 15995) +++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-11-25 15:44:24 UTC (rev 15996) @@ -451,7 +451,7 @@ public void writeFacetMarkup(FacesContext context, UIComponent component) throws IOException { Map<String, String> jsonMap = new HashMap(); if (component.getChildCount() != 0) { - jsonMap.put("dayListMarkup", getMarkupScriptBody(context, component, true)); + jsonMap.put("dayList", getMarkupScriptBody(context, component, true)); } addFacetMarkupScriptBody(context, component, jsonMap, "optionalHeader"); @@ -462,7 +462,20 @@ addFacetMarkupScriptBody(context, component, jsonMap, "header"); addFacetMarkupScriptBody(context, component, jsonMap, "footer"); - context.getResponseWriter().write(new JSONObject(jsonMap).toString()); + context.getResponseWriter().write("{"); + boolean isFirst = true; + for (Map.Entry<String, String> entry : jsonMap.entrySet()) { + if (isFirst) { + isFirst = false; + } else { + context.getResponseWriter().write(","); + } + context.getResponseWriter().write(entry.getKey() + MARKUP_SUFFIX); + context.getResponseWriter().write(":"); + context.getResponseWriter().write(entry.getValue()); + + } + context.getResponseWriter().write("}"); } private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, String> jsonMap, String facetName) throws IOException {

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15995 - branches/community/3.3.X/ui.

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

Author: nbelaevski Date: 2009-11-25 10:08:55 -0500 (Wed, 25 Nov 2009) New Revision: 15995 Modified: branches/community/3.3.X/ui/pom.xml Log: Fixed compilation failure in ui/* modules due to missing dependencies Modified: branches/community/3.3.X/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2009-11-25 11:34:50 UTC (rev 15994) +++ branches/community/3.3.X/ui/pom.xml 2009-11-25 15:08:55 UTC (rev 15995) @@ -187,6 +187,68 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.13</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> <version>3.3.3-SNAPSHOT</version> <scope>test</scope>

14 years, 5 months

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 November 2009