April 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r16774 - root/framework/trunk/commons/src/main/java/org/richfaces.

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

Author: abelevich Date: 2010-04-20 11:05:30 -0400 (Tue, 20 Apr 2010) New Revision: 16774 Modified: root/framework/trunk/commons/src/main/java/org/richfaces/PartialStateHolderHelper.java Log: fix getValueExpression Modified: root/framework/trunk/commons/src/main/java/org/richfaces/PartialStateHolderHelper.java =================================================================== --- root/framework/trunk/commons/src/main/java/org/richfaces/PartialStateHolderHelper.java 2010-04-17 17:42:12 UTC (rev 16773) +++ root/framework/trunk/commons/src/main/java/org/richfaces/PartialStateHolderHelper.java 2010-04-20 15:05:30 UTC (rev 16774) @@ -172,19 +172,14 @@ public Object eval(Serializable key, Object defaultValue) { Object retVal = get(key); if (retVal == null) { - retVal = getValueExpressionValue(); + retVal = getValueExpressionValue(key.toString()); } return (retVal != null) ? retVal : defaultValue; } - protected Object getValueExpressionValue() { + protected Object getValueExpressionValue(String name) { return null; - -// ValueExpression ve = stateHolder.getValueExpression(key.toString()); -// if (ve != null) { -// retVal = ve.getValue(stateHolder.getFacesContext().getELContext()); -// } }

14 years

1
0
0 / 0

JBoss Rich Faces SVN: r16773 - in root: examples/trunk/richfaces-demo/src/main/webapp/WEB-INF and 12 other directories.

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

Author: amarkhel Date: 2010-04-17 13:42:12 -0400 (Sat, 17 Apr 2010) New Revision: 16773 Added: root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/SkinBean.java root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/skin.xhtml root/framework/trunk/impl/src/main/java/org/richfaces/context/PreRenderViewListener.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/CancelControlIcon.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerFieldGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/resource/CSSCompiler.java root/framework/trunk/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java root/framework/trunk/impl/src/main/java/org/richfaces/resource/Xcss2EcssConverter.java root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.Base2WayGradient.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.BaseGradient.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.CustomizeableGradient.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.GradientA.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.ButtonGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.HeaderGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.InputGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.MenuGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.TabGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.BaseControlBackgroundImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.ButtonBackgroundImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.GradientAlignment.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.GradientType.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.InputBackgroundImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.StandardButtonBgImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.StandardButtonPressedBgImage.resource.properties root/framework/trunk/impl/src/main/resources/META-INF/prerenderview-listener.faces-config.xml root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic.ecss root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_both.ecss root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_classes.ecss root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended.ecss root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_both.ecss root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_classes.ecss Modified: root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/web.xml root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/Java2Dresource.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java root/framework/trunk/pom.xml Log: Skins initial commit Added: root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/SkinBean.java =================================================================== --- root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/SkinBean.java (rev 0) +++ root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/SkinBean.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,35 @@ +/** + * + */ +package org.richfaces.demo.common; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.faces.context.FacesContext; +import javax.faces.event.ValueChangeEvent; +import javax.faces.model.SelectItem; + + +/** + * @author sim + * + */ +public class SkinBean implements Serializable { + /** + * + */ + private static final long serialVersionUID = -2399884208294434812L; + private String skin; + public String getSkin() { + return skin; + } + + + + public void setSkin(String skin) { + this.skin = skin; + } + +} Modified: root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-04-17 13:25:25 UTC (rev 16772) +++ root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-04-17 17:42:12 UTC (rev 16773) @@ -20,6 +20,15 @@ <managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> - + <managed-bean> + <managed-bean-name>skinBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.SkinBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>skin</property-name> + <property-class>java.lang.String</property-class> + <value>blueSky</value> + </managed-property> + </managed-bean> </faces-config> \ No newline at end of file Modified: root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2010-04-17 13:25:25 UTC (rev 16772) +++ root/examples/trunk/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2010-04-17 17:42:12 UTC (rev 16773) @@ -23,8 +23,18 @@ <context-param> <param-name>javax.faces.PROJECT_STAGE</param-name> <param-value>Development</param-value> - </context-param> - + </context-param> + + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING</param-name> + <param-value>enable</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> + <param-value>enable</param-value> + </context-param> + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Added: root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/skin.xhtml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/skin.xhtml (rev 0) +++ root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/skin.xhtml 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,19 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <ui:composition template="/templates/main.xhtml"> + <ui:define name="body"> + <h:form> + <p> Sample of skinning</p> + Type in input name of skin. For example laguna, wine, ruby etc.. and press Change skin button. + <h:inputText value="#{skinBean.skin}" /> + <h:commandButton value="Change skin"/> + <h:outputText styleClass="rich-fieldset" value="Panel Background color sample" /> + <h:outputText styleClass="rich-link" value="General Link color sample" /> + </h:form> + </ui:define> + </ui:composition> +</html> \ No newline at end of file Modified: root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml 2010-04-17 13:25:25 UTC (rev 16772) +++ root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml 2010-04-17 17:42:12 UTC (rev 16773) @@ -4,7 +4,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://java.sun.com/jsf/composite/rich"> - <rich:panel> + <rich:panel bodyClass=""> <f:facet name="header"> <h:outputText value="Navigation" /> </f:facet> @@ -29,7 +29,9 @@ value="#{facesContext.externalContext.requestContextPath}/richfaces/log.jsf">a4j:log</h:outputLink> <hr/> <h:outputLink - value="#{facesContext.externalContext.requestContextPath}/richfaces/dataTable.jsf">h:dataTable vs Ajax</h:outputLink> + value="#{facesContext.externalContext.requestContextPath}/richfaces/dataTable.jsf">h:dataTable vs Ajax</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/skin.jsf">Skin sample</h:outputLink> </h:panelGrid> </rich:panel> </ui:composition> Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -39,7 +39,9 @@ * If is it equals "true" , framework should proparate exception to client-side. */ public static final String HANDLE_VIEW_EXPIRED_ON_CLIENT = "org.ajax4jsf.handleViewExpiredOnClient"; - + public static final String[] STD_CONTROLS_SKINNING_PARAM = {"org.richfaces.CONTROL_SKINNING"}; + public static final String[] STD_CONTROLS_SKINNING_CLASSES_PARAM = {"org.richfaces.CONTROL_SKINNING_CLASSES"}; + public static final String[] CONTROL_SKINNING_LEVEL = {"org.richfaces.CONTROL_SKINNING_LEVEL"}; /** * */ @@ -59,7 +61,37 @@ public static boolean isDatatableUsesViewLocale(FacesContext context) { return getBoolean(context, DATATABLE_USES_VIEW_LOCALE, false); } + + /** + * Defines what the skinning level used + * + * @param context + * @return value of CONTROL_SKINNING_LEVEL parameter if present + */ + public static String getSkinningLevel(FacesContext context) { + return getInitParameter(context, CONTROL_SKINNING_LEVEL); + } + /** + * Method for determining STD_CONTROLS_SKINNING_PARAM parameter + * + * @param context + * @return value of STD_CONTROLS_SKINNING_PARAM parameter if present. + */ + public static String getStandartControlSkinningParameter(FacesContext context) { + return getInitParameter(context, STD_CONTROLS_SKINNING_PARAM); + } + + /** + * Method for determining STD_CONTROLS_SKINNING_CLASSES_PARAM parameter + * + * @param context + * @return value of STD_CONTROLS_SKINNING_CLASSES_PARAM parameter if present. + */ + public static String getStandartControlSkinningClassesParameter(FacesContext context) { + return getInitParameter(context, STD_CONTROLS_SKINNING_CLASSES_PARAM); + } + static int getInteger(FacesContext context, String[] paramNames, int defaulValue) { String initParameter = getInitParameter(context, paramNames); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/Java2Dresource.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/Java2Dresource.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/resource/Java2Dresource.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -21,10 +21,15 @@ package org.ajax4jsf.resource; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.HtmlDimensions; import org.ajax4jsf.util.NumericDataInputStream; import org.ajax4jsf.util.NumericDataOutputStream; import org.richfaces.resource.AbstractBaseResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import javax.faces.application.ResourceHandler; import javax.faces.component.StateHolder; import javax.faces.context.FacesContext; import javax.imageio.ImageIO; @@ -35,19 +40,25 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.Map; /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.3 $ $Date: 2007/02/01 15:31:57 $ */ public abstract class Java2Dresource extends AbstractBaseResource implements StateHolder { + private static final String SKIN_MARKER = "Skin."; private ImageType imageType; public Java2Dresource(ImageType imageType) { super(); this.imageType = imageType; } - + + public void populateParameters(Map<String, String> parameters){ + + } + public static enum ImageType { GIF("gif") { @Override @@ -225,4 +236,62 @@ public void setTransient(boolean newTransientValue) { throw new UnsupportedOperationException(); } + + protected String getValueParameter(FacesContext context, String name) { + SkinFactory skinFactory = SkinFactory.getInstance(); + + Skin skin = skinFactory.getSkin(context); + String value = (String) skin.getParameter(context, name); + + if (value == null || value.length() == 0) { + skin = skinFactory.getDefaultSkin(context); + value = (String) skin.getParameter(context, name); + } + + return value; + } + + protected String encodeSkinParameter(String param){ + if(param.startsWith(SKIN_MARKER)){ + String name = param.substring(SKIN_MARKER.length()); + return getValueParameter(FacesContext.getCurrentInstance(), name ); + } + return param; + } + + protected Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { + Skin skin; + if (useDefault) { + skin = SkinFactory.getInstance().getDefaultSkin(context); + } else { + skin = SkinFactory.getInstance().getSkin(context); + } + + return decodeColor((String) skin.getParameter(context, name)); + } + + protected Integer getHeight(FacesContext context, String heightParamName) { + SkinFactory skinFactory = SkinFactory.getInstance(); + Skin skin = skinFactory.getSkin(context); + + String height = (String) skin.getParameter(context, heightParamName); + if (height == null || height.length() == 0) { + skin = skinFactory.getDefaultSkin(context); + height = (String) skin.getParameter(context, heightParamName); + } + + if (height != null && height.length() != 0) { + return Integer.valueOf(HtmlDimensions.decode(height).intValue()); + } else { + return Integer.valueOf(16); + } + } + + protected Integer decodeColor(String value) { + if (value != null && value.length() != 0) { + return Integer.valueOf(HtmlColor.decode(value).getRGB()); + } else { + return null; + } + } } Added: root/framework/trunk/impl/src/main/java/org/richfaces/context/PreRenderViewListener.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/PreRenderViewListener.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/PreRenderViewListener.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,168 @@ +package org.richfaces.context; + +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +import javax.faces.component.UIOutput; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.PreRenderViewEvent; +import javax.faces.event.SystemEvent; +import javax.faces.event.SystemEventListener; + +import org.ajax4jsf.context.ContextInitParameters; +import org.richfaces.log.RichfacesLogger; +import org.slf4j.Logger; + +/** + * This class used for determining what standard skinning resources should be encoded. + * Implements SystemEventListener and reacts on PreRenderViewEvent + * + * @author amarkhel + * @since 4.0 + */ +public class PreRenderViewListener implements SystemEventListener { + + private static final String BASIC = "basic"; + + private static final String EXTENDED = "extended"; + + private static final String ENABLE = "enable"; + + private static final String _CLASSES_ECSS = "_classes.ecss"; + + private static final String ECSS = ".ecss"; + + private static final String _BOTH_ECSS = "_both.ecss"; + + private static final String HEAD = "head"; + + private static final String NAME_ATTRIBBUTE = "name"; + + private static final String STYLESHEET_RENDERER = "javax.faces.resource.Stylesheet"; + + // private static final Logger LOG = RichfacesLogger.APPLICATION.getLogger(); + private boolean useStdControlsSkinning; + + private boolean useStdControlsSkinningClasses; + + private boolean extendedSkinningAllowed; + + /* + * (non-Javadoc) + * + * @see javax.faces.event.SystemEventListener#isListenerForSource(java.lang.Object) + */ + public boolean isListenerForSource(Object source) { + return true; + } + + private void setUseStdControlsSkinning(boolean stdControlsSkinning) { + this.useStdControlsSkinning = stdControlsSkinning; + } + + private void setUseStdControlsSkinningClasses(boolean stdControlsSkinningClasses) { + this.useStdControlsSkinningClasses = stdControlsSkinningClasses; + } + + private void setExtendedSkinningAllowed(boolean extendedSkinningAllowed) { + this.extendedSkinningAllowed = extendedSkinningAllowed; + } + + private void initialize(FacesContext context) { + boolean extendedSkinningAllowed = true; + String skinningLevel = ContextInitParameters.getSkinningLevel(context); + if (skinningLevel != null && skinningLevel.length() > 0) { + if (BASIC.equals(skinningLevel)) { + extendedSkinningAllowed = false; + } else if (!EXTENDED.equals(skinningLevel)) { + throw new IllegalArgumentException("Value: " + skinningLevel + " of " + + ContextInitParameters.CONTROL_SKINNING_LEVEL[0] + " init parameter is invalid! Only " + EXTENDED + + ", " + BASIC + " can be used"); + } + } + + this.setExtendedSkinningAllowed(extendedSkinningAllowed); + + boolean useStdControlsSkinning = false; + + String stdControlsSkinning = ContextInitParameters.getStandartControlSkinningParameter(context); + if (stdControlsSkinning != null) { + useStdControlsSkinning = ENABLE.equals(stdControlsSkinning); + } + + this.setUseStdControlsSkinning(useStdControlsSkinning); + + boolean useStdControlsSkinningClasses = true; + + String stdControlsSkinningClasses = ContextInitParameters.getStandartControlSkinningClassesParameter(context); + if (stdControlsSkinningClasses != null) { + useStdControlsSkinningClasses = ENABLE.equals(stdControlsSkinningClasses); + } + + this.setUseStdControlsSkinningClasses(useStdControlsSkinningClasses); + + } + + /* + * (non-Javadoc) + * + * @see javax.faces.event.SystemEventListener#processEvent(javax.faces.event.SystemEvent) + */ + public void processEvent(SystemEvent event) throws AbortProcessingException { + + if (event instanceof PreRenderViewEvent) { + initialize(FacesContext.getCurrentInstance()); + String resourceSuffix = null; + + if (useStdControlsSkinning) { + if (useStdControlsSkinningClasses) { + resourceSuffix = _BOTH_ECSS; + } else { + resourceSuffix = ECSS; + } + } else { + if (useStdControlsSkinningClasses) { + resourceSuffix = _CLASSES_ECSS; + } else { + // no resources + } + } + + if (resourceSuffix != null) { + addResource("richfaces.css/basic".concat(resourceSuffix)); + + if (extendedSkinningAllowed) { + addResource("richfaces.css/extended".concat(resourceSuffix)); + } + } + } + } + + private void addResource(String name) { + FacesContext context = FacesContext.getCurrentInstance(); + UIOutput output = new UIOutput(); + output.setRendererType(STYLESHEET_RENDERER); + output.getAttributes().put(NAME_ATTRIBBUTE, name); + context.getViewRoot().addComponentResource(context, output, HEAD); + } + +} Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -261,57 +261,9 @@ stream.writeByte((byte) this.gradientType.ordinal()); } - private Integer decodeColor(String value) { - if (value != null && value.length() != 0) { - return Integer.valueOf(HtmlColor.decode(value).getRGB()); - } else { - return null; - } - } - public boolean isCacheable() { return true; } - protected String getValueParameter(FacesContext context, String name) { - SkinFactory skinFactory = SkinFactory.getInstance(); - - Skin skin = skinFactory.getSkin(context); - String value = (String) skin.getParameter(context, name); - - if (value == null || value.length() == 0) { - skin = skinFactory.getDefaultSkin(context); - value = (String) skin.getParameter(context, name); - } - - return value; - } - - protected Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { - Skin skin; - if (useDefault) { - skin = SkinFactory.getInstance().getDefaultSkin(context); - } else { - skin = SkinFactory.getInstance().getSkin(context); - } - - return decodeColor((String) skin.getParameter(context, name)); - } - - protected Integer getHeight(FacesContext context, String heightParamName) { - SkinFactory skinFactory = SkinFactory.getInstance(); - Skin skin = skinFactory.getSkin(context); - - String height = (String) skin.getParameter(context, heightParamName); - if (height == null || height.length() == 0) { - skin = skinFactory.getDefaultSkin(context); - height = (String) skin.getParameter(context, heightParamName); - } - - if (height != null && height.length() != 0) { - return Integer.valueOf(HtmlDimensions.decode(height).intValue()); - } else { - return Integer.valueOf(16); - } - } + } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -21,8 +21,18 @@ package org.richfaces.renderkit.html; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; +import java.util.Map; + +import javax.faces.context.FacesContext; + import org.ajax4jsf.resource.Java2Dresource; -import org.ajax4jsf.util.HtmlColor; import org.ajax4jsf.util.NumericDataInputStream; import org.richfaces.renderkit.html.images.GradientAlignment; import org.richfaces.renderkit.html.images.GradientType; @@ -30,17 +40,16 @@ import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; -import javax.faces.context.FacesContext; -import java.awt.*; -import java.awt.geom.AffineTransform; -import java.awt.geom.Rectangle2D; - /** * @author Nick Belaevski - nbelaevski(a)exadel.com * created 02.02.2007 */ public class CustomizeableGradient extends Java2Dresource { + private static final String BASE_COLOR = "baseColor"; + + private static final String GRADIENT_COLOR = "gradientColor"; + protected Dimension dimension = new Dimension(20, 500); protected Integer gradientColor; @@ -58,7 +67,19 @@ gradientType = GradientType.getByParameter(gradientTypeString); } } - + + @Override + public void populateParameters(Map<String, String> parameters){ + if(parameters.containsKey(GRADIENT_COLOR)){ + String gradientColorValue = encodeSkinParameter(parameters.get(GRADIENT_COLOR)); + this.gradientColor = decodeColor(gradientColorValue); + } + if(parameters.containsKey(BASE_COLOR)){ + String baseColorValue = encodeSkinParameter(parameters.get(BASE_COLOR)); + this.baseColor = decodeColor(baseColorValue); + } + } + public Dimension getDimension() { return dimension; } @@ -146,14 +167,6 @@ drawGradient(g2d, rect, secondLayer, gradientHeight / 2); } - private Integer decodeColor(String value) { - if (value != null && value.length() != 0) { - return Integer.valueOf(HtmlColor.decode(value).getRGB()); - } else { - return null; - } - } - @Override protected void readState(FacesContext context, NumericDataInputStream stream) { super.readState(context, stream); @@ -164,7 +177,7 @@ this.gradientAlignment = GradientAlignment.values()[stream.readByte()]; this.gradientType = GradientType.values()[stream.readByte()]; } - + @Override protected void writeState(FacesContext context, org.ajax4jsf.util.NumericDataOutputStream stream) { super.writeState(context, stream); @@ -183,20 +196,6 @@ return true; } - protected String getValueParameter(FacesContext context, String name) { - SkinFactory skinFactory = SkinFactory.getInstance(); - - Skin skin = skinFactory.getSkin(context); - String value = (String) skin.getParameter(context, name); - - if (value == null || value.length() == 0) { - skin = skinFactory.getDefaultSkin(context); - value = (String) skin.getParameter(context, name); - } - - return value; - } - public Integer getGradientColor() { return gradientColor; } Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/CancelControlIcon.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/CancelControlIcon.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/CancelControlIcon.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,123 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.Java2Dresource.ImageType; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.NumericDataInputStream; +import org.ajax4jsf.util.Zipper2; + +/** + * implementation of the default CANCEL icon renderer + * @author Anton Belevich + * @since 3.2.0 + * + */ +public class CancelControlIcon extends Java2Dresource { + + protected static final String ALTERNATE_COLOR = "#ED6161"; + protected Integer iconColor; + protected Integer iconBorderColor; + private static final Dimension dimensions = new Dimension(11, 11); + + public CancelControlIcon() { + super(ImageType.GIF); + } + + @Override + public Dimension getDimension() { + return dimensions; + } + + @Override + protected void readState(FacesContext context, NumericDataInputStream stream) { + super.readState(context, stream); + + this.iconColor = stream.readIntColor(); + this.iconBorderColor = stream.readIntColor(); + } + + protected void writeState(FacesContext context, org.ajax4jsf.util.NumericDataOutputStream stream) { + super.writeState(context, stream); + + stream.writeIntColor(this.iconColor); + stream.writeIntColor(this.iconBorderColor); + } + + @Override + protected void paint(Graphics2D g2d, Dimension dimension) { + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); +// g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON); +// g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_DEFAULT); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_DEFAULT); + Color iconColour = new Color(iconColor); + Color iconBorder = new Color(iconBorderColor); + g2d.setColor(iconColour); + + Color altenateColor = HtmlColor.decode(ALTERNATE_COLOR); + GradientPaint gradient = new GradientPaint(2,3,altenateColor,3,9,iconColour); + g2d.setPaint(gradient); + + // draw cross + g2d.drawLine(2, 3, 7, 8); + g2d.drawLine(3, 3, 7, 7); + g2d.drawLine(3, 2, 8, 7); + + g2d.drawLine(2, 7, 7, 2); + g2d.drawLine(3, 7, 7, 3); + g2d.drawLine(3, 8, 8, 3); + + //draw border + g2d.setColor(iconBorder); + g2d.drawLine(1, 3, 3, 5); + g2d.drawLine(3, 5, 1, 7); + g2d.drawLine(1, 7, 3, 9); + g2d.drawLine(3, 9, 5, 7); + g2d.drawLine(5, 7, 7, 9); + g2d.drawLine(7, 9, 9, 7); + g2d.drawLine(9, 7, 7, 5); + g2d.drawLine(7, 5, 9, 3); + g2d.drawLine(9, 3, 7, 1); + g2d.drawLine(7, 1, 5, 3); + g2d.drawLine(5, 3, 3, 1); + g2d.drawLine(3, 1, 1, 3); + + + } +} + Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxButtonPressGradient.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,36 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +/** + * @author Anton Belevich + * @since 3.2.0 + */ +public class ComboBoxButtonPressGradient extends BaseGradient{ + + public ComboBoxButtonPressGradient() { + super(7,15 , 9, Skin.HEADER_BACKGROUND_COLOR, "headerGradientColor"); + } + +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputErrorIcon.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,52 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; + +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; + +public class InputErrorIcon extends OneColorBasedResource { + + public InputErrorIcon() { + super(6, 11, "warningColor"); + } + + /** + * @see Java2Dresource#paint(ResourceContext, Graphics2D) + */ + protected void paint(ResourceContext context, Graphics2D g2d) { + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setColor(getBasicColor()); + g2d.fillRect(3, 2, 2, 6); + g2d.fillRect(3, 9, 2, 2); + } + + @Override + public Dimension getDimension() { + // TODO Auto-generated method stub + return null; + } + +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/OneColorBasedResource.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,61 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import java.awt.Color; +import java.awt.Dimension; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; + +public abstract class OneColorBasedResource extends Java2Dresource { + + private Dimension dimension; + + private String basicColorParamName; + + private Color basicColor; + + public OneColorBasedResource(int width, int height, final String basicColorParamName) { + super(ImageType.GIF); + this.basicColorParamName = basicColorParamName; + this.dimension = new Dimension(width, height); + + } + + /** + * @see Java2Dresource#isCacheable(ResourceContext) + */ + public boolean isCacheable(ResourceContext ctx) { + return true; + } + + /** + * Gets value of basicColor field. + * @return value of basicColor field + */ + public Color getBasicColor() { + return basicColor; + } +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonGradient.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonGradient.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,30 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import org.richfaces.renderkit.html.BaseGradient; + +public class SpinnerButtonGradient extends BaseGradient { + public SpinnerButtonGradient() { + super(30, 50, 20, "headerGradientColor", "headerBackgroundColor"); + } +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerFieldGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerFieldGradient.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerFieldGradient.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,33 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import org.richfaces.renderkit.html.BaseGradient; + +public class SpinnerFieldGradient extends BaseGradient { + + public SpinnerFieldGradient() { + super(30, 50, 12, "additionalBackgroundColor", "controlBackgroundColor"); + } + + +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/resource/CSSCompiler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/resource/CSSCompiler.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/resource/CSSCompiler.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,281 @@ +package org.richfaces.resource; + +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.ValueExpression; +import javax.faces.application.Resource; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.util.ELUtils; +import org.richfaces.log.RichfacesLogger; +import org.slf4j.Logger; +import org.w3c.css.sac.InputSource; +import org.w3c.dom.css.CSSImportRule; +import org.w3c.dom.css.CSSRule; +import org.w3c.dom.css.CSSRuleList; +import org.w3c.dom.css.CSSStyleDeclaration; +import org.w3c.dom.css.CSSStyleRule; +import org.w3c.dom.css.CSSStyleSheet; + +import com.steadystate.css.parser.CSSOMParser; + +public class CSSCompiler { + + private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger(); + private static final String INVALID_RESOURCE_FORMAT_COLON_ERROR = + "Invalid resource format. Property ''{0}'' contains more than one colon (:)."; + private static final String INVALID_RESOURCE_FORMAT_NO_LIBRARY_NAME_ERROR = + "Invalid resource format. Property ''{0}'' cannot be parsed to extract resource name and library name."; + private static final String INVALID_RESOURCE_FORMAT_ERROR = + "Invalid resource format. Property ''{0}'' cannot be parsed."; + public static InputStream parse(Resource resource) throws IOException { + FacesContext ctx = FacesContext.getCurrentInstance(); + InputStream stream = new BufferedInputStream( + new ELEvaluatingInputStream(ctx, + resource, + resource.getInputStream())); + StringBuilder main = new StringBuilder(); + try { + InputSource source = new InputSource(new InputStreamReader(stream)); + CSSOMParser parser = new CSSOMParser(); + // parse and create a stylesheet composition + CSSStyleSheet stylesheet = parser.parseStyleSheet(source, null,null); + + // now iterate through the dom and inspect. + + CSSRuleList ruleList = stylesheet.getCssRules(); + for (int i = 0; i < ruleList.getLength(); i++) { + CSSRule rule = ruleList.item(i); + if(rule instanceof CSSImportRule){ + main.append(rule.getCssText()); + main.append("\r\n"); + }else if (rule instanceof CSSStyleRule) { + CSSStyleRule styleRule = (CSSStyleRule) rule; + boolean needAppendSelector = false; + StringBuilder selector = new StringBuilder(); + selector.append(styleRule.getSelectorText()); + CSSStyleDeclaration styleDeclaration = styleRule.getStyle(); + selector.append("{" + "\r\n"); + for (int j = 0; j < styleDeclaration.getLength(); j++) { + String property = styleDeclaration.item(j); + String value = styleDeclaration.getPropertyCSSValue(property).getCssText(); + if(value.startsWith("\"")){ + //Remove quotas + value = value.substring(1, value.length()-1); + } + if(value != null && value.trim().length() > 0 && !value.equals("\"\"")){ + //One of properties of selector is not empty + needAppendSelector = true; + selector.append("\t" + property + ":"); + selector.append(value + ";" + "\r\n"); + } + } + selector.append("}" + "\r\n"); + if(needAppendSelector){ + main.append(selector); + } + }// end of StyleRule instance test + } // end of ruleList loop + + if (stream != null){ + stream.close(); + } + new ByteArrayInputStream(main.toString().getBytes()); + return new ByteArrayInputStream(main.toString().getBytes("US-ASCII")); + } + + catch (IOException ioe) { + LOGGER.warn("IO Error: " + ioe + "while evaluating dynamic CSS"); + } catch (Exception e) { + LOGGER.warn("Error: " + e + "while evaluating dynamic CSS"); + } + return null; + } + + private static final class ELEvaluatingInputStream extends InputStream { + + // Premature optimization is the root of all evil. Blah blah. + private List<Integer> buf = new ArrayList<Integer>(1024); + private boolean failedExpressionTest = false; + private boolean writingExpression = false; + private InputStream inner; + private FacesContext ctx; + private Resource info; + + // ---------------------------------------------------- Constructors + + + public ELEvaluatingInputStream(FacesContext ctx, + Resource info, + InputStream inner) { + + this.inner = inner; + this.info = info; + this.ctx = ctx; + + } + + + // ------------------------------------------------ Methods from InputStream + + + @Override + public int read() throws IOException { + int i; + char c; + + if (failedExpressionTest) { + i = nextRead; + nextRead = -1; + failedExpressionTest = false; + } else if (writingExpression) { + if (0 < buf.size()) { + i = buf.remove(0); + } else { + writingExpression = false; + i = inner.read(); + } + } else { + // Read a character. + i = inner.read(); + c = (char) i; + // If it *might* be an expression... + if (c == '#') { + // read another character. + i = inner.read(); + c = (char) i; + // If it's '{', assume we have an expression. + if (c == '{') { + // read it into the buffer, and evaluate it into the + // same buffer. + readExpressionIntoBufferAndEvaluateIntoBuffer(); + // set the flag so that we need to return content + // from the buffer. + writingExpression = true; + // Make sure to swallow the '{'. + i = this.read(); + } else { + // It's not an expression, we need to return '#', + i = (int) '#'; + // then return whatever we just read, on the + // *next* read; + nextRead = (int) c; + failedExpressionTest = true; + } + } + } + + return i; + } + + + private int nextRead = -1; + + + private void readExpressionIntoBufferAndEvaluateIntoBuffer() + throws IOException { + int i; + char c; + do { + i = inner.read(); + c = (char) i; + if (c == '}') { + evaluateExpressionIntoBuffer(); + } else { + buf.add(i); + } + } while (c != '}' && i != -1); + } + + /* + * At this point, we know that getBuf() returns a List<Integer> + * that contains the bytes of the expression. + * Turn it into a String, turn the String into a ValueExpression, + * evaluate it, store the toString() of it in + * expressionResult; + */ + private void evaluateExpressionIntoBuffer() { + char chars[] = new char[buf.size()]; + for (int i = 0, len = buf.size(); i < len; i++) { + chars[i] = (char) (int) buf.get(i); + } + String expressionBody = new String(chars); + int colon; + // If this expression contains a ":" + if (-1 != (colon = expressionBody.indexOf(":"))) { + // Make sure it contains only one ":" + if (!isPropertyValid(expressionBody)) { + String message = MessageFormat.format(INVALID_RESOURCE_FORMAT_COLON_ERROR, + expressionBody); + throw new ELException(message); + } + String[] parts = split(expressionBody, ":"); + if (null == parts[0] || null == parts[1]) { + String message = MessageFormat.format(INVALID_RESOURCE_FORMAT_NO_LIBRARY_NAME_ERROR, + expressionBody); + throw new ELException(message); + + } + try { + int mark = parts[0].indexOf("[") + 2; + char quoteMark = parts[0].charAt(mark - 1); + parts[0] = parts[0].substring(mark, colon); + if (parts[0].equals("this")) { + parts[0] = info.getLibraryName(); + mark = parts[1].indexOf("]") - 1; + parts[1] = parts[1].substring(0, mark); + expressionBody = "resource[" + quoteMark + parts[0] + + ":" + parts[1] + quoteMark + "]"; + } + } + catch (Exception e) { + String message = MessageFormat.format(INVALID_RESOURCE_FORMAT_ERROR, + expressionBody); + throw new ELException(message); + + } + } + ELContext elContext = ctx.getELContext(); + ValueExpression ve = + ctx.getApplication().getExpressionFactory(). + createValueExpression(elContext, "#{" + expressionBody + + "}", String.class); + Object value = ve.getValue(elContext); + String expressionResult = ((value != null) ? value.toString() : ""); + buf.clear(); + for (int i = 0, len = expressionResult.length(); i < len; i++) { + buf.add((int) expressionResult.charAt(i)); + } + } + + + private String[] split(String expressionBody, String toSplit) { + return Pattern.compile(expressionBody).split(toSplit, 0); + } + + + @Override + public void close() throws IOException { + inner.close(); + super.close(); + + } + + + private boolean isPropertyValid(String property) { + int idx = property.indexOf(':'); + return (property.indexOf(':', idx + 1) == -1); + } + + } +} Added: root/framework/trunk/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.io.IOException; +import java.io.InputStream; + +import javax.faces.application.ProjectStage; +import javax.faces.application.Resource; +import javax.faces.context.FacesContext; + +import org.richfaces.application.ServiceTracker; +import org.richfaces.log.RichfacesLogger; +import org.richfaces.skin.SkinFactory; +import org.slf4j.Logger; +/** + * @author amarkhel + * Class, that represented dynamic CSS resource. + * + */ +public class CompiledCSSResource extends AbstractBaseResource { + + private static final String SKIN = "?skin="; + private static final String TEXT_CSS = "text/css"; + private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger(); + + public CompiledCSSResource(Resource resource){ + this.resourceDelegate = resource; + } + + private Resource resourceDelegate; + + @Override + public InputStream getInputStream() { + InputStream stream = null; + try{ + stream = CSSCompiler.parse(resourceDelegate); + } + catch(IOException ioe){ + LOGGER.warn("IO Error: " + ioe + "while loading dynamic CSS"); + } + return stream; + } + + @Override + public String getContentType() { + return TEXT_CSS; + } + + public Resource getResourceDelegate() { + return resourceDelegate; + } + + public void setResourceDelegate(Resource resourceDelegate) { + this.resourceDelegate = resourceDelegate; + } + + @Override + public String getResourceName() { + return resourceDelegate.getResourceName(); + } + + @Override + public String getRequestPath() { + StringBuilder b = new StringBuilder(); + String path = resourceDelegate.getRequestPath(); + b.append(path); + b.append(SKIN); + b.append(getSkinHashCode()); + return b.toString(); + } + + private int getSkinHashCode() { + return ((SkinFactory)ServiceTracker.getService(FacesContext.getCurrentInstance(), SkinFactory.class)).getSkin(FacesContext.getCurrentInstance()).hashCode(); + } + + @Override + public boolean userAgentNeedsUpdate(FacesContext context) { + if(context.isProjectStage(ProjectStage.Development)){ + return true; + } + return super.userAgentNeedsUpdate(context); + } +} Modified: root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -23,6 +23,8 @@ import org.ajax4jsf.cache.Cache; import org.ajax4jsf.cache.CacheManager; +import org.ajax4jsf.resource.Java2Dresource; +import org.jboss.cache.util.BeanUtils; import org.richfaces.context.AttributesContext; import org.richfaces.context.SingletonsContext; import org.richfaces.log.RichfacesLogger; @@ -45,6 +47,7 @@ import java.net.URL; import java.text.MessageFormat; import java.util.Date; +import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; @@ -238,7 +241,8 @@ } if (isResourceExists(resourceName)) { - resource = createHandlerDependentResource(resourceName); + Map<String, String> params = Util.parseResourceParameters(resourceKey); + resource = createHandlerDependentResource(resourceName, params); } if (resource == null) { @@ -423,9 +427,10 @@ * Should be called only if {@link #isResourceExists(String)} returns <code>true</code> * * @param resourceName + * @param params * @return */ - protected Resource createHandlerDependentResource(String resourceName) { + protected Resource createHandlerDependentResource(String resourceName, Map<String, String> params) { Resource resource = null; ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); @@ -436,7 +441,11 @@ if (Resource.class.isAssignableFrom(resourceClass)) { resource = (Resource) resourceClass.newInstance(); resource.setResourceName(resourceName); - + if(resource instanceof Java2Dresource){ + Java2Dresource dynamicResource = (Java2Dresource)resource; + dynamicResource.populateParameters(params); + resource = dynamicResource; + } if (LOGGER.isDebugEnabled()) { LOGGER.debug(MessageFormat.format("Successfully created instance of {0} resource", resourceName)); @@ -454,18 +463,29 @@ @Override public Resource createResource(String resourceName, String libraryName, String contentType) { - Resource result; - + Resource result = null; + Map<String, String> params = Util.parseResourceParameters(resourceName); + resourceName = extractParametersFromResourceName(resourceName); if ((resourceName != null) && ((libraryName == null) || (libraryName.length() == 0)) && isResourceExists(resourceName)) { - result = createHandlerDependentResource(resourceName); + result = createHandlerDependentResource(resourceName, params); } else { - result = defaultHandler.createResource(resourceName, libraryName, contentType); + result = defaultHandler.createResource(resourceName, libraryName, contentType); + if(resourceName.indexOf(".ecss") != -1){ + result = new CompiledCSSResource(result); + } } return result; } + private String extractParametersFromResourceName(String resourceName) { + if(!(resourceName.lastIndexOf("?") != -1)){ + return resourceName; + } + return resourceName.substring(0, resourceName.lastIndexOf("?")); + } + @Override public Resource createResource(String resourceName, String libraryName) { return createResource(resourceName, libraryName, null); @@ -479,7 +499,9 @@ @Override public String getRendererTypeForResourceName(String resourceName) { - // TODO add support for dynamic resources + if(resourceName.indexOf(".ecss") != -1){ + return "javax.faces.resource.Stylesheet"; + } return defaultHandler.getRendererTypeForResourceName(resourceName); } Added: root/framework/trunk/impl/src/main/java/org/richfaces/resource/Xcss2EcssConverter.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/resource/Xcss2EcssConverter.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/resource/Xcss2EcssConverter.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,256 @@ +package org.richfaces.resource; + +import java.io.File; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.Attributes; +import javax.xml.parsers.SAXParser; + + +public class Xcss2EcssConverter { + + public static void main(String[] args) { + + // Create Handler + Handler handler = new Handler(); + + // Create the parser + CreateParser parser = new CreateParser(handler); + + // Parse the XML file, handler generates the output + String string = "E:/projs/richafces4/framework/trunk/impl/src/test/java/org/ajax4jsf/cache/extended.xcss"; + parser.parse(string); + } + +} +class Handler extends DefaultHandler { + private final String TEMPLATE = "template"; + private final String SELECTOR = "selector"; + private final String STYLE = "style"; + private final String RESOURCE = "resource"; + private final String ATTRIBBUTE = "attribute"; + private final String VERBATIM = "verbatim"; + private final String IMPORT = "importResource"; + private StringBuilder ecssContent; + private boolean hasAttribbute = false; + private boolean verbatim = false;; + + /** + * Receive notification of the start of an element. + * @param namespaceURI - The Namespace URI, or the empty string if the element has no Namespace URI or if Namespace processing is not being performed. + * @param localName - The local name (without prefix), or the empty string if Namespace processing is not being performed. + * @param qName - The qualified name (with prefix), or the empty string if qualified names are not available. + * @param atts - The attributes attached to the element. If there are no attributes, it shall be an empty Attributes object. + * @throws SAXException - Any SAX exception, possibly wrapping another exception. + */ + public void startElement(String namespaceURI, String localName, String qName, Attributes atts) + throws SAXException { + if (TEMPLATE.equals(localName)){ + ecssContent = new StringBuilder(); + } + if (IMPORT.equals(localName)){ + String src = atts.getValue("src"); + ecssContent.append("@import url(#{resource['"); + ecssContent.append(src); + ecssContent.append("']}\r\n"); + } + if (VERBATIM.equals(localName)){ + verbatim = true; + } + if (SELECTOR.equals(localName)){ + String value = atts.getValue("name"); + if(null != value){ + ecssContent.append(value); + ecssContent.append("{\r\n"); + } + } + if (STYLE.equals(localName)){ + // Reset Order's values + String name = atts.getValue("name"); + String skin = atts.getValue("skin"); + String value = atts.getValue("value"); + if(null != name){ + if(skin != null){ + ecssContent.append("\t"); + ecssContent.append(name); + ecssContent.append(":"); + ecssContent.append("'#{richSkin."); + ecssContent.append(skin); + ecssContent.append("}'"); + }else if(value != null){ + ecssContent.append("\t"); + ecssContent.append(name); + ecssContent.append(":"); + ecssContent.append(value); + }else{ + ecssContent.append("\t"); + ecssContent.append(name); + ecssContent.append(":"); + } + } + } + if (RESOURCE.equals(localName)){ + String value = atts.getValue("f:key"); + if(null != value){ + ecssContent.append("'url(#{resource['"); + ecssContent.append(value); + + } + } + if (ATTRIBBUTE.equals(localName)){ + if(!hasAttribbute){ + ecssContent.append("?"); + hasAttribbute = true; + } + String name = atts.getValue("name"); + String skin = atts.getValue("skin"); + String value = atts.getValue("value"); + if(null != name){ + if(skin != null){ + ecssContent.append(name); + ecssContent.append("="); + ecssContent.append("Skin."); + ecssContent.append(skin); + ecssContent.append("&"); + }else if(value != null){ + ecssContent.append(name); + ecssContent.append("="); + try { + ecssContent.append(URLDecoder.decode(value, "UTF-8")); + } catch (UnsupportedEncodingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + ecssContent.append("&"); + }else{ + //ERROR + } + } + } + } + + /** + * Receive notification of character data inside an element. + * @param ch - The characters. + * @param start - The start position in the character array. + * @param length - The number of characters to use from the character array. + * @throws SAXException - Any SAX exception, possibly wrapping another exception. + */ + public void characters(char[] ch, int start, int length) + throws SAXException { + if ( verbatim ){ + String strValue = new String(ch, start, length); + ecssContent.append(strValue); + + } + + } + + /** + * Receive notification of the end of an element. + * @param namespaceURI - The Namespace URI, or the empty string if the element has no Namespace URI or if Namespace processing is not being performed. + * @param localName - The local name (without prefix), or the empty string if Namespace processing is not being performed. + * @param qName - The qualified name (with prefix), or the empty string if qualified names are not available. + * @throws SAXException - Any SAX exception, possibly wrapping another exception. + */ + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { + if (TEMPLATE.equals(localName)){ + System.out.println(ecssContent.toString().trim()); + } + if (VERBATIM.equals(localName)){ + verbatim = false; + } + if (SELECTOR.equals(localName)){ + ecssContent.append("}\r\n"); + } + if (STYLE.equals(localName)){ + ecssContent.append(";\r\n"); + } + if (RESOURCE.equals(localName)){ + if(hasAttribbute){ + ecssContent.setLength(ecssContent.length() -1); + } + ecssContent.append("']})'"); + hasAttribbute = false; + } + if (ATTRIBBUTE.equals(localName)){ + } + } + + } +class CreateParser { + + private DefaultHandler handler; + private SAXParser saxParser; + + /** + * Constructor + * @param handler - DefaultHandler for the SAX parser + */ + public CreateParser(DefaultHandler handler) { + this.handler = handler; + create(); + } + + /** + * Create the SAX parser + */ + private void create() { + try { + // Obtain a new instance of a SAXParserFactory. + SAXParserFactory factory = SAXParserFactory.newInstance(); + // Specifies that the parser produced by this code will provide support for XML namespaces. + factory.setNamespaceAware(true); + // Specifies that the parser produced by this code will validate documents as they are parsed. + //factory.setValidating(true); + // Creates a new instance of a SAXParser using the currently configured factory parameters. + saxParser = factory.newSAXParser(); + } catch (Throwable t) { + t.printStackTrace(); + } + } + + /** + * Parse a File + * @param file - File + */ + public void parse(File file){ + try{ + saxParser.parse(file,handler); + } catch (Throwable t) { + t.printStackTrace(); + } + } + + /** + * Parse a URI + * @param uri - String + */ + public void parse(String uri){ + try{ + saxParser.parse(uri,handler); + } catch (Throwable t) { + t.printStackTrace(); + } + } + + /** + * Parse a Stream + * @param stream - InputStream + */ + public void parse(InputStream stream){ + try{ + saxParser.parse(stream,handler); + } catch (Throwable t) { + t.printStackTrace(); + } + } + } + Modified: root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/impl/src/main/java/org/richfaces/util/Util.java 2010-04-17 17:42:12 UTC (rev 16773) @@ -42,6 +42,7 @@ package org.richfaces.util; import org.ajax4jsf.Messages; +import org.ajax4jsf.util.HtmlColor; import org.ajax4jsf.util.base64.Codec; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; @@ -59,6 +60,7 @@ import java.io.OutputStream; import java.io.StreamCorruptedException; import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; @@ -67,7 +69,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -79,6 +83,9 @@ * @since 4.0 */ public final class Util { + private static final String EQUALS_SIGN = "="; + private static final String AND_SEPARATOR = "&"; + private static final String QUESTION_SIGN = "?"; private static final String DATA_BYTES_SEPARATOR = "/DATB/"; private static final String DATA_SEPARATOR = "/DATA/"; @@ -346,6 +353,31 @@ return viewHandler.getResourceURL(context, resourcePath); } + public static Map<String, String> parseResourceParameters(String resourceName){ + Map<String, String> params = new HashMap<String, String>(); + if(!(resourceName.lastIndexOf(QUESTION_SIGN) != -1)){ + return params; + } + resourceName = resourceName.substring(resourceName.lastIndexOf(QUESTION_SIGN) + 1); + try { + if (resourceName.trim().length() > 0) { + String query = resourceName; + String paramPairs[] = query.split(AND_SEPARATOR); + for(int i = 0; i < paramPairs.length ; i++){ + String pair[] = paramPairs[i].split(EQUALS_SIGN); + String key = URLDecoder.decode(pair[0], "UTF-8").trim(); + String value = URLDecoder.decode(pair[1], "UTF-8").trim(); + if(key != null && value != null && key.trim().length() > 0 && value.trim().length() > 0){ + params.put(key, value); + } + } + } + } catch (UnsupportedEncodingException e) { + RESOURCE_LOGGER.debug("Cannot parse resource parameters"); + } + return params; + } + public static String decodeResourceURL(FacesContext context) { ExternalContext externalContext = context.getExternalContext(); String resourceName = null; Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.Base2WayGradient.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.BaseGradient.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.CustomizeableGradient.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.GradientA.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.ButtonGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.HeaderGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.InputGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.MenuGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.TabGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.BaseControlBackgroundImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.ButtonBackgroundImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.GradientAlignment.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.GradientType.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.InputBackgroundImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.StandardButtonBgImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/org.richfaces.renderkit.html.images.StandardButtonPressedBgImage.resource.properties =================================================================== Added: root/framework/trunk/impl/src/main/resources/META-INF/prerenderview-listener.faces-config.xml =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/prerenderview-listener.faces-config.xml (rev 0) +++ root/framework/trunk/impl/src/main/resources/META-INF/prerenderview-listener.faces-config.xml 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0"> + <name>richfaces</name> + <application> + <system-event-listener> + <system-event-listener-class>org.richfaces.context.PreRenderViewListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class> + </system-event-listener> + </application> + +</faces-config> \ No newline at end of file Modified: root/framework/trunk/pom.xml =================================================================== --- root/framework/trunk/pom.xml 2010-04-17 13:25:25 UTC (rev 16772) +++ root/framework/trunk/pom.xml 2010-04-17 17:42:12 UTC (rev 16773) @@ -73,6 +73,11 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</version> + </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,25 @@ +input, select, textarea, button, keygen, isindex, legend, a { + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.controlTextColor}'; +} +fieldset { + border-width: 1px; + border-style: solid; + padding: 10px; + border-color : '#{richSkin.panelBorderColor}'; +} +hr { + border-width: 1px; + border-style: solid; + border-color : '#{richSkin.panelBorderColor}'; +} +a { + color : '#{richSkin.generalLinkColor}'; +} +a:hover { + color : '#{richSkin.hoverLinkColor}'; +} +a:visited { + color : '#{richSkin.visitedLinkColor}'; +} \ No newline at end of file Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_both.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_both.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_both.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,2 @@ +@import url(#{resource['richfaces.css/basic.ecss']}); +@import url(#{resource['richfaces.css/basic_classes.ecss']}); \ No newline at end of file Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_classes.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_classes.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/basic_classes.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,349 @@ +.rich-container input, .rich-input, .rich-container select, .rich-select, +.rich-container textarea, .rich-textarea, .rich-container button, .rich-button, +.rich-container keygen, .rich-keygen,.rich-container isindex, .rich-isindex, +.rich-container legend, .rich-legend,.rich-container a, .rich-link, +.rich-container fieldset, .rich-fieldset,.rich-field, .rich-field-edit, .rich-field-error, +.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press { + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.controlTextColor}'; +} + +.rich-container fieldset, .rich-fieldset { + border-width: 1px; + border-style: solid; + padding: 10px; +} + +.rich-container hr, .rich-hr { + border-width: 1px; + border-style: solid; +} + +.rich-container legend, .rich-legend { + font-weight : bold; +} + +.rich-container form, .rich-form { + padding : 0px; + margin : 0px; +} + +.rich-container fieldset, .rich-fieldset{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-container hr, .rich-hr{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-container a, .rich-link{ + color: '#{richSkin.generalLinkColor}'; +} + +.rich-container a:hover, .rich-link:hover{ + color : '#{richSkin.hoverLinkColor}'; +} + +.rich-container a:visited, .rich-link:visited{ + color : '#{richSkin.visitedLinkColor}'; +} + +.rich-field, .rich-field-edit, .rich-field-error{ + border-width: 1px; + border-style: inset; + border-color: '#{richSkin.panelBorderColor}'; +} + +.rich-field{ + background-color : '#{richSkin.controlBackgroundColor}'; + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})'; + background-repeat : no-repeat; + background-position : 1px 1px; +} + +.rich-field-edit{ + background-color : '#{richSkin.editBackgroundColor}'; +} + +.rich-field-error{ + background-color : '#{richSkin.warningBackgroundColor}'; + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.InputErrorIcon']})'; + background-repeat : no-repeat; + background-position : center left; + padding-left : 7px; +} + +.rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press{ + border-width : 1px; + border-style : solid; + border-color : '#{richSkin.panelBorderColor}'; + background-color : '#{richSkin.trimColor}'; + padding : 2px 10px 2px 10px; + text-align : center; + cursor : pointer; + background-repeat : repeat-x; + background-position : top left; +} + +.rich-button{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})'; +} + +.rich-button-disabled{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})'; +} + +.rich-button-over{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})'; +} + +.rich-button-press{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.images.StandardButtonPressedBgImage']})'; + background-position : bottom left; +} + + /*border color styles*/ + +.rich-box-border-color-control-select{ + border-color : '#{richSkin.selectControlColor}'; +} + +.rich-box-border-color-subborder{ + border-color : '#{richSkin.subBorderColor}'; +} + +.rich-box-border-color-header{ + border-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-border-color-general{ + border-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-border-color-additional{ + border-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-border-color-panel{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-border-color-tip{ + border-color : '#{richSkin.tipBorderColor}'; +} + +.rich-box-border-color-table{ + border-color : '#{richSkin.tableBorderColor}'; +} + +.rich-box-border-control-select, .rich-box-border-subborder, .rich-box-border-header, + .rich-box-border-general, .rich-box-border-additional, .rich-box-border-panel, .rich-box-border-tip, .rich-box-border-table{ + border-style : solid; + border-width : 1px; +} + +.rich-box-border-control-select{ + border-color : '#{richSkin.selectControlColor}'; +} + +.rich-box-border-subborder{ + border-color : '#{richSkin.subBorderColor}'; +} + +.rich-box-border-header{ + border-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-border-general{ + border-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-border-additional{ + border-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-border-panel{ + border-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-border-tip{ + border-color : '#{richSkin.tipBorderColor}'; +} + +.rich-box-border-table{ + border-color : '#{richSkin.tableBorderColor}'; +} + + /*background color styles*/ + +.rich-box-bgcolor-header{ + background-color : '#{richSkin.headerBackgroundColor}'; +} + +.rich-box-bgcolor-general{ + background-color : '#{richSkin.generalBackgroundColor}'; +} + +.rich-box-bgcolor-additional{ + background-color : '#{richSkin.additionalBackgroundColor}'; +} + +.rich-box-bgcolor-panel{ + background-color : '#{richSkin.panelBorderColor}'; +} + +.rich-box-bgcolor-tab{ + background-color : '#{richSkin.tabBackgroundColor}'; +} + +.rich-box-bgcolor-trim{ + background-color : '#{richSkin.trimColor}'; +} + +.rich-box-bgcolor-tip{ + background-color : '#{richSkin.tipBackgroundColor}'; +} + +.rich-box-bgcolor-table{ + background-color : '#{richSkin.tableBackgroundColor}'; +} + +.rich-box-bgcolor-table-footer{ + background-color : '#{richSkin.tableFooterBackgroundColor}'; +} + +.rich-box-bgcolor-table-subfooter{ + background-color : '#{richSkin.tableSubfooterBackgroundColor}'; +} + +.rich-box-bgcolor-editor{ + background-color : '#{richSkin.editorBackgroundColor}'; +} + +.rich-box-bgcolor-edit{ + background-color : '#{richSkin.editBackgroundColor}'; +} + + /*text color styles*/ + +.rich-text-color-header{ + color : '#{richSkin.headerTextColor}'; +} + +.rich-text-color-general{ + color : '#{richSkin.generalTextColor}'; +} + +.rich-text-color-tab-disabled{ + color : '#{richSkin.tabDisabledTextColor}'; +} + +.rich-text-color-select{ + color : '#{richSkin.selectControlColor}'; +} + +.rich-text-color-link-general{ + color : '#{richSkin.generalLinkColor}'; +} + +.rich-text-color-link-hover{ + color : '#{richSkin.hoverLinkColor}'; +} + +.rich-text-color-link-visited{ + color : '#{richSkin.visitedLinkColor}'; +} + + /*font size styles*/ + +.rich-font-size-general{ + font-size : '#{richSkin.generalSizeFont}'; +} + +.rich-font-size-header{ + font-size : '#{richSkin.headerSizeFont}'; +} + + /*font family styles*/ + +.rich-font-family-general{ + font-family : '#{richSkin.generalFamilyFont}'; +} + +.rich-font-family-header{ + font-family : '#{richSkin.headerFamilyFont}'; +} + + /* text styles */ + +.rich-text-general{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.generalTextColor}'; +} + +.rich-text-header{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.headerFamilyFont}'; + color : '#{richSkin.headerTextColor}'; +} + +.rich-text-tab-disabled{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.generalFamilyFont}'; + color : '#{richSkin.tabDisabledTextColor}'; +} + +.rich-text-control-select{ + font-size : '#{richSkin.generalSizeFont}'; + font-family : '#{richSkin.headerFamilyFont}; + color : '#{richSkin.selectControlColor}'; +} + + /*gradient styles*/ + +.rich-gradient-header-inverse{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-header{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.HeaderGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-tab{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.TabGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-tab-inverse{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-input{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.InputGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-menu-inverse{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-menu{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.MenuGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-button-inverse{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage']})'; + background-repeat : repeat-x; +} + +.rich-gradient-button{ + background-image : 'url(#{resource['org.richfaces.renderkit.html.gradientimages.ButtonGradientImage']})'; + background-repeat : repeat-x; +} \ No newline at end of file Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,86 @@ +input, select, textarea, button, keygen, isindex{ + border-width:1px; + border-color:'#{richSkin.panelBorderColor}'; + color:'#{richSkin.controlTextColor}'; +} + + + *|button { + border-width: 1px; + background-repeat : repeat-x; + background-position : top left; + } + + button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] { + border-width: 1px; + background-repeat : repeat-x; + background-position : top left; + } + + + *|button{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.headerTextColor}'; + background-color:'#{richSkin.headerBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})'; +} +button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"]{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.headerTextColor}'; + background-color:'#{richSkin.headerBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})'; +} +*|button[disabled]{ + color:'#{richSkin.tabDisabledTextColor}'; + border-color:'#{richSkin.tableFooterBackgroundColor}'; + background-color:'#{richSkin.tableFooterBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})'; +} +button[type="button"][disabled], button[type="reset"][disabled], button[type="submit"][disabled], input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled]{ + color:'#{richSkin.tabDisabledTextColor}'; + border-color:'#{richSkin.tableFooterBackgroundColor}'; + background-color:'#{richSkin.tableFooterBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})'; +} + + + *|textarea { + border-width: 1px; + border-style : inset; + background-repeat : no-repeat; + background-position : 1px 1px; + } + + textarea[type="textarea"], input[type="text"], input[type="password"], select { + border-width: 1px; + border-style : inset; + background-repeat : no-repeat; + background-position : 1px 1px; + } + + *|textarea{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.controlTextColor}'; + background-color:'#{richSkin.controlBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})'; +} +textarea[type="textarea"], input[type="text"], input[type="password"], select{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.controlTextColor}'; + background-color:'#{richSkin.controlBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})'; +} +*|textarea[disabled], *|select[disabled]{ + color:'#{richSkin.panelBorderColor}'; +} +textarea[type="textarea"][disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled]{ + color:'#{richSkin.panelBorderColor}'; +} \ No newline at end of file Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_both.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_both.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_both.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,2 @@ +@import url(#{resource['richfaces.css/extended.ecss']}); +@import url(#{resource['richfaces.css/extended_classes.ecss']}); \ No newline at end of file Added: root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_classes.ecss =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_classes.ecss (rev 0) +++ root/ui/trunk/components/core/src/main/resources/META-INF/resources/richfaces.css/extended_classes.ecss 2010-04-17 17:42:12 UTC (rev 16773) @@ -0,0 +1,96 @@ +.rich-container input, .rich-input, .rich-container select, .rich-select, .rich-container textarea, .rich-textarea, .rich-container button, .rich-button, .rich-container keygen, .rich-keygen, .rich-container isindex, .rich-isindex{ + border-width:1px; + border-color:'#{richSkin.panelBorderColor}'; + color:'#{richSkin.controlTextColor}'; +} + + + .rich-container *|button, .rich-button { + border-width: 1px; + background-repeat : repeat-x; + background-position : top left; + } + + .rich-button, + .rich-container button[type="button"], .rich-button-button, + .rich-container button[type="reset"], .rich-button-reset, + .rich-container button[type="submit"], .rich-button-submit, + .rich-container input[type="reset"], .rich-input-reset, + .rich-container input[type="submit"], .rich-input-submit, + .rich-container input[type="button"], .rich-input-button { + border-width: 1px; + background-repeat : repeat-x; + background-position : top left; + } + + + .rich-container *|button, .rich-button{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.headerTextColor}'; + background-color:'#{richSkin.headerBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})'; +} + .rich-button, .rich-container button[type="button"], .rich-button-button, .rich-container button[type="reset"], .rich-button-reset, .rich-container button[type="submit"], .rich-button-submit, .rich-container input[type="reset"], .rich-input-reset, .rich-container input[type="submit"], .rich-input-submit, .rich-container input[type="button"], .rich-input-button { + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.headerTextColor}'; + background-color:'#{richSkin.headerBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})'; +} +.rich-container *|button[disabled]{ + color:'#{richSkin.tabDisabledTextColor}'; + background-color:'#{richSkin.tableFooterBackgroundColor}'; + border-color:'#{richSkin.tableFooterBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})'; +} +.rich-button-disabled, .rich-container button[type="button"][disabled], .rich-button-button-disabled, .rich-container button[type="reset"][disabled], .rich-button-reset-disabled, .rich-container button[type="submit"][disabled], .rich-button-submit-disabled, .rich-container input[type="reset"][disabled], .rich-input-reset-disabled, .rich-container input[type="submit"][disabled], .rich-input-submit-disabled, .rich-container input[type="button"][disabled], .rich-input-button-disabled{ + color:'#{richSkin.tabDisabledTextColor}'; + background-color:'#{richSkin.tableFooterBackgroundColor}'; + border-color:'#{richSkin.tableFooterBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})'; +} + + + .rich-container *|textarea { + border-width: 1px; + border-style : inset; + background-repeat : no-repeat; + background-position : 1px 1px; + } + + .rich-textarea, + .rich-container textarea[type="textarea"], .rich-textarea-textarea, + .rich-container input[type="text"], .rich-input-text, + .rich-container input[type="password"], .rich-input-password, + .rich-container select, .rich-select { + border-width: 1px; + border-style : inset; + background-repeat : no-repeat; + background-position : 1px 1px; + } + + .rich-container *|textarea{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.controlTextColor}'; + background-color:'#{richSkin.controlBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})'; +} +.rich-textarea, .rich-container textarea[type="textarea"], .rich-textarea-textarea, .rich-container input[type="text"], .rich-input-text, .rich-container input[type="password"], .rich-input-password, .rich-container select, .rich-select{ + border-color:'#{richSkin.panelBorderColor}'; + font-size:'#{richSkin.generalSizeFont}'; + font-family:'#{richSkin.generalFamilyFont}'; + color:'#{richSkin.controlTextColor}'; + background-color:'#{richSkin.controlBackgroundColor}'; + background-image:'url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})'; +} +.rich-container *|textarea[disabled], .rich-container *|select[disabled]{ + color:'#{richSkin.panelBorderColor}'; +} +.rich-textarea-disabled, .rich-container textarea[type="textarea"][disabled], .rich-textarea-textarea-disabled, .rich-container input[type="text"][disabled], .rich-input-text-disabled, .rich-container input[type="password"][disabled], .rich-input-password-disabled, .rich-container select[disabled], .rich-select-disabled{ + color:'#{richSkin.panelBorderColor}'; +} \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16772 - in root/ui/trunk/components/core/src/main: java/org/ajax4jsf/facelets/tag and 2 other directories.

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

Author: nbelaevski Date: 2010-04-17 09:25:25 -0400 (Sat, 17 Apr 2010) New Revision: 16772 Added: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java Removed: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorStack.java root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsAddingComponentHandlerWrapper.java root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsTagHandlerDelegateFactoryImpl.java Modified: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml Log: a4j:ajax tag handlers package refactoring Modified: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -1,26 +1,27 @@ package org.ajax4jsf.component.behavior; -import org.ajax4jsf.component.AjaxClientBehavior; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.richfaces.cdk.annotations.JsfBehavior; -import org.richfaces.cdk.annotations.Tag; -import org.richfaces.cdk.annotations.TagType; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; import javax.el.ELContext; import javax.el.ValueExpression; import javax.faces.component.UIComponentBase; import javax.faces.component.behavior.FacesBehavior; import javax.faces.context.FacesContext; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; +import org.ajax4jsf.component.AjaxClientBehavior; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.richfaces.cdk.annotations.JsfBehavior; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; + /** * @author Anton Belevich */ @JsfBehavior( id = "org.ajax4jsf.behavior.Ajax", - tag = @Tag(name = "ajax", handler = "org.ajax4jsf.facelets.tag.AjaxHandler",type=TagType.Facelets) + tag = @Tag(name = "ajax", handler = "org.richfaces.taglib.html.facelets.AjaxHandler", type = TagType.Facelets) ) @FacesBehavior(value = "org.ajax4jsf.behavior.Ajax") public class AjaxBehavior extends javax.faces.component.behavior.AjaxBehavior implements AjaxClientBehavior { Deleted: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -1,269 +0,0 @@ -package org.ajax4jsf.facelets.tag; - -import java.beans.BeanDescriptor; -import java.beans.BeanInfo; - -import java.io.IOException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.el.ELContext; -import javax.el.MethodExpression; - -import javax.faces.application.Application; -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.AjaxBehaviorEvent; -import javax.faces.event.AjaxBehaviorListener; -import javax.faces.view.AttachedObjectHandler; -import javax.faces.view.AttachedObjectTarget; -import javax.faces.view.BehaviorHolderAttachedObjectHandler; -import javax.faces.view.BehaviorHolderAttachedObjectTarget; -import javax.faces.view.facelets.BehaviorConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.CompositeFaceletHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.TagAttribute; -import javax.faces.view.facelets.TagException; -import javax.faces.view.facelets.TagHandler; - -import org.ajax4jsf.component.behavior.AjaxBehavior; - -public class AjaxHandler extends TagHandler implements BehaviorHolderAttachedObjectHandler { - - // TODO - is that implementation dependency? - private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers"; - private final TagAttribute disabled; - private final TagAttribute event; - private final TagAttribute execute; - private final TagAttribute immediate; - private final TagAttribute limitRender; - private final TagAttribute listener; - private final TagAttribute onbeforedomupdate; - private final TagAttribute onbegin; - private final TagAttribute oncomplete; - private final TagAttribute onerror; - private final TagAttribute onevent; - private final TagAttribute queueId; - private final TagAttribute render; - private final TagAttribute similarityGroupingId; - private final TagAttribute statusId; - private final boolean wrapping; - - public AjaxHandler(BehaviorConfig config) { - super(config); - this.event = this.getAttribute("event"); - this.execute = this.getAttribute("execute"); - this.render = this.getAttribute("render"); - this.disabled = this.getAttribute("disabled"); - this.immediate = this.getAttribute("immediate"); - this.listener = this.getAttribute("listener"); - this.limitRender = this.getAttribute("limitRender"); - this.queueId = this.getAttribute("queueId"); - this.statusId = this.getAttribute("status"); - this.similarityGroupingId = this.getAttribute("similarityGroupingId"); - this.onevent = this.getAttribute("onevent"); - this.onerror = this.getAttribute("onerror"); - this.onbegin = this.getAttribute("onbegin"); - this.oncomplete = this.getAttribute("oncomplete"); - this.onbeforedomupdate = this.getAttribute("onbeforedomupdate"); - this.wrapping = isWrapping(); - } - - public void apply(FaceletContext fContext, UIComponent parent) throws IOException { - String eventName = getEventName(); - - if (this.wrapping) { - applyWrapping(fContext, parent, eventName); - } else { - applyNested(fContext, parent, eventName); - } - } - - private static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) { - Map<String, Object> attrs = component.getAttributes(); - @SuppressWarnings({ - "unchecked"}) List<AttachedObjectHandler> list = - (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS); - - if (list == null) { - list = new ArrayList<AttachedObjectHandler>(); - attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list); - } - - return list; - } - - private void applyNested(FaceletContext ctx, UIComponent parent, String eventName) { - if (!ComponentHandler.isNew(parent)) { - return; - } - - if (UIComponent.isCompositeComponent(parent)) { - BeanInfo componentBeanInfo = (BeanInfo) parent.getAttributes().get(UIComponent.BEANINFO_KEY); - - if (null == componentBeanInfo) { - throw new TagException(tag, "Error: enclosing composite component does not have BeanInfo attribute"); - } - - BeanDescriptor componentDescriptor = componentBeanInfo.getBeanDescriptor(); - - if (null == componentDescriptor) { - throw new TagException(tag, - "Error: enclosing composite component BeanInfo does not have BeanDescriptor"); - } - - @SuppressWarnings( - "unchecked") List<AttachedObjectTarget> targetList = - (List<AttachedObjectTarget>) componentDescriptor.getValue( - AttachedObjectTarget.ATTACHED_OBJECT_TARGETS_KEY); - - if (null == targetList) { - throw new TagException(tag, "Error: enclosing composite component does not support behavior events"); - } - - boolean supportedEvent = false; - - for (AttachedObjectTarget target : targetList) { - if (target instanceof BehaviorHolderAttachedObjectTarget) { - BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target; - - if ((null != eventName && eventName.equals(behaviorTarget.getName())) - || (null == eventName && behaviorTarget.isDefaultEvent())) { - supportedEvent = true; - - break; - } - } - } - - if (supportedEvent) { - getOrCreateRetargetableHandlersList(parent).add(this); - } else { - throw new TagException(tag, "Error: enclosing composite component does not support event " + eventName); - } - } else if (parent instanceof ClientBehaviorHolder) { - applyAttachedObject(ctx, parent, eventName); - } else { - throw new TagException(this.tag, "Unable to attach <a4j:ajax> to non-ClientBehaviorHolder parent"); - } - } - - private void applyWrapping(FaceletContext ctx, UIComponent parent, String eventName) throws IOException { - AjaxBehavior ajaxBehavior = createAjaxBehavior(ctx, eventName); - FacesContext context = ctx.getFacesContext(); - BehaviorStack ajaxBehaviors = BehaviorStack.getBehaviorStack(context, true); - - ajaxBehaviors.pushBehavior(context, ajaxBehavior, AjaxBehavior.BEHAVIOR_ID, eventName); - nextHandler.apply(ctx, parent); - ajaxBehaviors.popBehavior(); - } - - public void applyAttachedObject(FaceletContext fContext, UIComponent parent, String eventName) { - ClientBehaviorHolder bHolder = (ClientBehaviorHolder) parent; - - if (null == eventName) { - eventName = bHolder.getDefaultEventName(); - - if (null == eventName) { - throw new TagException(this.tag, "Event attribute could not be determined: " + eventName); - } - } else { - Collection<String> eventNames = bHolder.getEventNames(); - - if (!eventNames.contains(eventName)) { - throw new TagException(this.tag, - eventName + "event is not supported for the " - + parent.getClass().getSimpleName()); - } - } - - AjaxBehavior ajaxBehavior = createAjaxBehavior(fContext, eventName); - - bHolder.addClientBehavior(eventName, ajaxBehavior); - } - - public AjaxBehavior createAjaxBehavior(FaceletContext fContext, String eventName) { - Application application = fContext.getFacesContext().getApplication(); - AjaxBehavior ajaxBehavior = (AjaxBehavior) application.createBehavior(AjaxBehavior.BEHAVIOR_ID); - - setBehaviorAttribute(fContext, ajaxBehavior, this.disabled, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.immediate, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.execute, Object.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.render, Object.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.limitRender, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.queueId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.statusId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.similarityGroupingId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onevent, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onerror, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onbegin, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.oncomplete, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onbeforedomupdate, String.class); - registerBehaviorListener(fContext, ajaxBehavior, listener); - - return ajaxBehavior; - } - - public void applyAttachedObject(FacesContext context, UIComponent parent) { - FaceletContext ctx = (FaceletContext) context.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY); - - applyAttachedObject(ctx, parent, getEventName()); - } - - private void setBehaviorAttribute(FaceletContext ctx, AjaxBehavior behavior, TagAttribute attr, Class<?> type) { - if (attr != null) { - behavior.setValueExpression(attr.getLocalName(), attr.getValueExpression(ctx, type)); - } - } - - public String getEventName() { - return (this.event != null) ? this.event.getValue() : null; - } - - public String getFor() { - return null; - } - - private boolean isWrapping() { - return (this.nextHandler instanceof TagHandler) || (this.nextHandler instanceof CompositeFaceletHandler); - } - - public void registerBehaviorListener(FaceletContext fContext, AjaxBehavior behavior, TagAttribute listenerAttr) { - if (listenerAttr != null) { - MethodExpression mExpression = listenerAttr.getMethodExpression(fContext, Object.class, - new Class[] {AjaxBehaviorEvent.class}); - - behavior.addAjaxBehaviorListener(new AjaxBehaviorListenerImpl(mExpression)); - } - } - - public class AjaxBehaviorListenerImpl implements AjaxBehaviorListener { - private MethodExpression methodExpression; - - public AjaxBehaviorListenerImpl() {} - - public AjaxBehaviorListenerImpl(MethodExpression expression) { - this.methodExpression = expression; - } - - public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException { - if (methodExpression != null) { - ELContext elContext = FacesContext.getCurrentInstance().getELContext(); - - try { - methodExpression.invoke(elContext, new Object[] {event}); - } catch (Exception e) { - - // TODO: log or message ?? - throw new AbortProcessingException(e); - } - } - } - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorStack.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorStack.java 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorStack.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -1,152 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - - - -package org.ajax4jsf.facelets.tag; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.faces.application.Application; -import javax.faces.component.StateHolder; -import javax.faces.component.behavior.ClientBehavior; -import javax.faces.component.behavior.ClientBehaviorHint; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; - -/** - * @author Nick Belaevski - * - * This class is necessary to handle nesting wrapping behaviors properly and is created - * to work around this issue: https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=655 - * - */ - -//TODO - check for bug resolution -final class BehaviorStack { - private static final String BEHAVIOR_STACK = "org.richfaces.BehaviorStack"; - private LinkedList<BehaviorInfo> behaviorStack = null; - - public BehaviorStack() { - behaviorStack = new LinkedList<BehaviorInfo>(); - } - - public static BehaviorStack getBehaviorStack(FacesContext context, boolean createIfNull) { - Map<Object, Object> attributes = context.getAttributes(); - BehaviorStack behaviorStack = (BehaviorStack) attributes.get(BEHAVIOR_STACK); - - if (behaviorStack == null && createIfNull) { - behaviorStack = new BehaviorStack(); - attributes.put(BEHAVIOR_STACK, behaviorStack); - } - - return behaviorStack; - } - - public void addBehaviors(FacesContext context, ClientBehaviorHolder behaviorHolder) { - if (behaviorStack == null || behaviorStack.isEmpty()) { - return; - } - - for (BehaviorInfo behaviorInfo : behaviorStack) { - behaviorInfo.addBehavior(context, behaviorHolder); - } - } - - public void pushBehavior(FacesContext context, ClientBehavior clientBehavior, String behaviorId, String eventName) { - Object behaviorState = ((StateHolder) clientBehavior).saveState(context); - - // closer behaviors are processed earlier - behaviorStack.addFirst(new BehaviorInfo(behaviorId, eventName, behaviorState)); - } - - public void popBehavior() { - if (!behaviorStack.isEmpty()) { - behaviorStack.removeFirst(); - } - } - - private static class BehaviorInfo { - private String behaviorId; - private Object behaviorState; - private String eventName; - - public BehaviorInfo(String behaviorId, String eventName, Object behaviorState) { - this.behaviorId = behaviorId; - this.eventName = eventName; - this.behaviorState = behaviorState; - } - - public void addBehavior(FacesContext context, ClientBehaviorHolder behaviorHolder) { - String eventName = this.eventName; - - if (eventName == null) { - eventName = behaviorHolder.getDefaultEventName(); - - if (eventName == null) { - return; - } - } - - if (shouldAddBehavior(behaviorHolder, eventName)) { - ClientBehavior behavior = createBehavior(context); - - behaviorHolder.addClientBehavior(eventName, behavior); - } - } - - private boolean shouldAddBehavior(ClientBehaviorHolder behaviorHolder, String eventName) { - if (!behaviorHolder.getEventNames().contains(eventName)) { - return false; - } - - Map<String, List<ClientBehavior>> clientBehaviorsMap = behaviorHolder.getClientBehaviors(); - List<ClientBehavior> clientBehaviors = clientBehaviorsMap.get(eventName); - - if (clientBehaviors == null || clientBehaviors.isEmpty()) { - return true; - } - - for (ClientBehavior behavior : clientBehaviors) { - Set<ClientBehaviorHint> hints = behavior.getHints(); - - if (hints.contains(ClientBehaviorHint.SUBMITTING)) { - return false; - } - } - - return true; - } - - private ClientBehavior createBehavior(FacesContext context) { - Application application = context.getApplication(); - ClientBehavior behavior = (ClientBehavior) application.createBehavior(this.behaviorId); - - ((StateHolder) behavior).restoreState(context, behaviorState); - - return behavior; - } - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsAddingComponentHandlerWrapper.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsAddingComponentHandlerWrapper.java 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsAddingComponentHandlerWrapper.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - - - -package org.ajax4jsf.facelets.tag; - -import java.io.IOException; - -import javax.el.ELException; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.Tag; -import javax.faces.view.facelets.TagAttribute; - -/** - * @author Nick Belaevski - */ -public class BehaviorsAddingComponentHandlerWrapper extends ComponentHandler { - private ComponentHandler componentHandler; - - public BehaviorsAddingComponentHandlerWrapper(ComponentHandler componentHandler) { - super(componentHandler.getComponentConfig()); - this.componentHandler = componentHandler; - } - - public void apply(FaceletContext ctx, UIComponent parent) throws IOException { - componentHandler.apply(ctx, parent); - } - - public void applyNextHandler(FaceletContext ctx, UIComponent c) throws IOException, FacesException, ELException { - componentHandler.applyNextHandler(ctx, c); - } - - public TagAttribute getBinding() { - return componentHandler.getBinding(); - } - - public ComponentConfig getComponentConfig() { - return componentHandler.getComponentConfig(); - } - - public Tag getTag() { - return componentHandler.getTag(); - } - - public TagAttribute getTagAttribute(String localName) { - return componentHandler.getTagAttribute(localName); - } - - public String getTagId() { - return componentHandler.getTagId(); - } - - public boolean equals(Object obj) { - return componentHandler.equals(obj); - } - - public int hashCode() { - return componentHandler.hashCode(); - } - - public String toString() { - return componentHandler.toString(); - } - - public boolean isDisabled(FaceletContext ctx) { - return componentHandler.isDisabled(ctx); - } - - public void onComponentCreated(FaceletContext ctx, UIComponent c, UIComponent parent) { - componentHandler.onComponentCreated(ctx, c, parent); - } - - public void onComponentPopulated(FaceletContext ctx, UIComponent c, UIComponent parent) { - FacesContext facesContext = ctx.getFacesContext(); - BehaviorStack behaviorStack = BehaviorStack.getBehaviorStack(facesContext, false); - - if (behaviorStack != null) { - if (c instanceof ClientBehaviorHolder) { - ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) c; - - behaviorStack.addBehaviors(facesContext, behaviorHolder); - } - } - - componentHandler.onComponentPopulated(ctx, c, parent); - } - - public void setAttributes(FaceletContext ctx, Object instance) { - componentHandler.setAttributes(ctx, instance); - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsTagHandlerDelegateFactoryImpl.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - - - -package org.ajax4jsf.facelets.tag; - -import javax.faces.view.facelets.BehaviorHandler; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.ConverterHandler; -import javax.faces.view.facelets.TagHandlerDelegate; -import javax.faces.view.facelets.TagHandlerDelegateFactory; -import javax.faces.view.facelets.ValidatorHandler; - -/** - * @author Nick Belaevski - */ -public class BehaviorsTagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory { - private TagHandlerDelegateFactory factory; - - public BehaviorsTagHandlerDelegateFactoryImpl(TagHandlerDelegateFactory factory) { - this.factory = factory; - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createBehaviorHandlerDelegate(javax.faces.view.facelets.BehaviorHandler) - */ - @Override - public TagHandlerDelegate createBehaviorHandlerDelegate(BehaviorHandler owner) { - return factory.createBehaviorHandlerDelegate(owner); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createComponentHandlerDelegate(javax.faces.view.facelets.ComponentHandler) - */ - @Override - public TagHandlerDelegate createComponentHandlerDelegate(ComponentHandler owner) { - - // TagHandlers structure is created when view is compiled - // so there's no need to check for BehaviorsStack - return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner)); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createConverterHandlerDelegate(javax.faces.view.facelets.ConverterHandler) - */ - @Override - public TagHandlerDelegate createConverterHandlerDelegate(ConverterHandler owner) { - return factory.createConverterHandlerDelegate(owner); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createValidatorHandlerDelegate(javax.faces.view.facelets.ValidatorHandler) - */ - @Override - public TagHandlerDelegate createValidatorHandlerDelegate(ValidatorHandler owner) { - return factory.createValidatorHandlerDelegate(owner); - } -} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java (from rev 16764, root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -0,0 +1,272 @@ +package org.richfaces.taglib.html.facelets; + +import java.beans.BeanDescriptor; +import java.beans.BeanInfo; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.MethodExpression; +import javax.faces.application.Application; +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.AjaxBehaviorEvent; +import javax.faces.event.AjaxBehaviorListener; +import javax.faces.view.AttachedObjectHandler; +import javax.faces.view.AttachedObjectTarget; +import javax.faces.view.BehaviorHolderAttachedObjectHandler; +import javax.faces.view.BehaviorHolderAttachedObjectTarget; +import javax.faces.view.facelets.BehaviorConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.CompositeFaceletHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.TagAttribute; +import javax.faces.view.facelets.TagException; +import javax.faces.view.facelets.TagHandler; + +import org.ajax4jsf.component.behavior.AjaxBehavior; + +public class AjaxHandler extends TagHandler implements BehaviorHolderAttachedObjectHandler { + + // TODO - is that implementation dependency? + private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers"; + private final TagAttribute disabled; + private final TagAttribute event; + private final TagAttribute execute; + private final TagAttribute immediate; + private final TagAttribute limitRender; + private final TagAttribute listener; + private final TagAttribute onbeforedomupdate; + private final TagAttribute onbegin; + private final TagAttribute oncomplete; + private final TagAttribute onerror; + private final TagAttribute onevent; + private final TagAttribute queueId; + private final TagAttribute render; + private final TagAttribute similarityGroupingId; + private final TagAttribute statusId; + private final boolean wrapping; + + public AjaxHandler(BehaviorConfig config) { + super(config); + this.event = this.getAttribute("event"); + this.execute = this.getAttribute("execute"); + this.render = this.getAttribute("render"); + this.disabled = this.getAttribute("disabled"); + this.immediate = this.getAttribute("immediate"); + this.listener = this.getAttribute("listener"); + this.limitRender = this.getAttribute("limitRender"); + this.queueId = this.getAttribute("queueId"); + this.statusId = this.getAttribute("status"); + this.similarityGroupingId = this.getAttribute("similarityGroupingId"); + this.onevent = this.getAttribute("onevent"); + this.onerror = this.getAttribute("onerror"); + this.onbegin = this.getAttribute("onbegin"); + this.oncomplete = this.getAttribute("oncomplete"); + this.onbeforedomupdate = this.getAttribute("onbeforedomupdate"); + this.wrapping = isWrapping(); + } + + public void apply(FaceletContext fContext, UIComponent parent) throws IOException { + String eventName = getEventName(); + + if (this.wrapping) { + applyWrapping(fContext, parent, eventName); + } else { + applyNested(fContext, parent, eventName); + } + } + + private static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) { + Map<String, Object> attrs = component.getAttributes(); + @SuppressWarnings({ + "unchecked"}) List<AttachedObjectHandler> list = + (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS); + + if (list == null) { + list = new ArrayList<AttachedObjectHandler>(); + attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list); + } + + return list; + } + + private void applyNested(FaceletContext ctx, UIComponent parent, String eventName) { + if (!ComponentHandler.isNew(parent)) { + return; + } + + if (UIComponent.isCompositeComponent(parent)) { + BeanInfo componentBeanInfo = (BeanInfo) parent.getAttributes().get(UIComponent.BEANINFO_KEY); + + if (null == componentBeanInfo) { + throw new TagException(tag, "Error: enclosing composite component does not have BeanInfo attribute"); + } + + BeanDescriptor componentDescriptor = componentBeanInfo.getBeanDescriptor(); + + if (null == componentDescriptor) { + throw new TagException(tag, + "Error: enclosing composite component BeanInfo does not have BeanDescriptor"); + } + + @SuppressWarnings( + "unchecked") List<AttachedObjectTarget> targetList = + (List<AttachedObjectTarget>) componentDescriptor.getValue( + AttachedObjectTarget.ATTACHED_OBJECT_TARGETS_KEY); + + if (null == targetList) { + throw new TagException(tag, "Error: enclosing composite component does not support behavior events"); + } + + boolean supportedEvent = false; + + for (AttachedObjectTarget target : targetList) { + if (target instanceof BehaviorHolderAttachedObjectTarget) { + BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target; + + if ((null != eventName && eventName.equals(behaviorTarget.getName())) + || (null == eventName && behaviorTarget.isDefaultEvent())) { + supportedEvent = true; + + break; + } + } + } + + if (supportedEvent) { + getOrCreateRetargetableHandlersList(parent).add(this); + } else { + throw new TagException(tag, "Error: enclosing composite component does not support event " + eventName); + } + } else if (parent instanceof ClientBehaviorHolder) { + applyAttachedObject(ctx, parent, eventName); + } else { + throw new TagException(this.tag, "Unable to attach <a4j:ajax> to non-ClientBehaviorHolder parent"); + } + } + + private void applyWrapping(FaceletContext ctx, UIComponent parent, String eventName) throws IOException { + AjaxBehavior ajaxBehavior = createAjaxBehavior(ctx, eventName); + FacesContext context = ctx.getFacesContext(); + BehaviorStack ajaxBehaviors = BehaviorStack.getBehaviorStack(context, true); + + ajaxBehaviors.pushBehavior(context, ajaxBehavior, AjaxBehavior.BEHAVIOR_ID, eventName); + nextHandler.apply(ctx, parent); + ajaxBehaviors.popBehavior(); + } + + public void applyAttachedObject(FaceletContext fContext, UIComponent parent, String eventName) { + ClientBehaviorHolder bHolder = (ClientBehaviorHolder) parent; + + if (null == eventName) { + eventName = bHolder.getDefaultEventName(); + + if (null == eventName) { + throw new TagException(this.tag, "Event attribute could not be determined: " + eventName); + } + } else { + Collection<String> eventNames = bHolder.getEventNames(); + + if (!eventNames.contains(eventName)) { + throw new TagException(this.tag, + eventName + "event is not supported for the " + + parent.getClass().getSimpleName()); + } + } + + AjaxBehavior ajaxBehavior = createAjaxBehavior(fContext, eventName); + + bHolder.addClientBehavior(eventName, ajaxBehavior); + } + + public AjaxBehavior createAjaxBehavior(FaceletContext fContext, String eventName) { + Application application = fContext.getFacesContext().getApplication(); + AjaxBehavior ajaxBehavior = (AjaxBehavior) application.createBehavior(AjaxBehavior.BEHAVIOR_ID); + + setBehaviorAttribute(fContext, ajaxBehavior, this.disabled, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.immediate, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.execute, Object.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.render, Object.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.limitRender, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.queueId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.statusId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.similarityGroupingId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onevent, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onerror, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onbegin, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.oncomplete, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onbeforedomupdate, String.class); + registerBehaviorListener(fContext, ajaxBehavior, listener); + + return ajaxBehavior; + } + + public void applyAttachedObject(FacesContext context, UIComponent parent) { + FaceletContext ctx = (FaceletContext) context.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY); + + applyAttachedObject(ctx, parent, getEventName()); + } + + private void setBehaviorAttribute(FaceletContext ctx, AjaxBehavior behavior, TagAttribute attr, Class<?> type) { + if (attr != null) { + behavior.setValueExpression(attr.getLocalName(), attr.getValueExpression(ctx, type)); + } + } + + public String getEventName() { + return (this.event != null) ? this.event.getValue() : null; + } + + public String getFor() { + return null; + } + + private boolean isWrapping() { + return (this.nextHandler instanceof TagHandler) || (this.nextHandler instanceof CompositeFaceletHandler); + } + + public void registerBehaviorListener(FaceletContext fContext, AjaxBehavior behavior, TagAttribute listenerAttr) { + if (listenerAttr != null) { + MethodExpression mExpression = listenerAttr.getMethodExpression(fContext, Object.class, + new Class[] {AjaxBehaviorEvent.class}); + + behavior.addAjaxBehaviorListener(new AjaxBehaviorListenerImpl(mExpression)); + } + } + + static class AjaxBehaviorListenerImpl implements AjaxBehaviorListener, Serializable { + /** + * + */ + private static final long serialVersionUID = 1812543470662919310L; + + private MethodExpression methodExpression; + + public AjaxBehaviorListenerImpl() {} + + public AjaxBehaviorListenerImpl(MethodExpression expression) { + this.methodExpression = expression; + } + + public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException { + if (methodExpression != null) { + ELContext elContext = FacesContext.getCurrentInstance().getELContext(); + + try { + methodExpression.invoke(elContext, new Object[] {event}); + } catch (Exception e) { + + // TODO: log or message ?? + throw new AbortProcessingException(e); + } + } + } + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java (from rev 16764, root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorStack.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -0,0 +1,152 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + + + +package org.richfaces.taglib.html.facelets; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.faces.application.Application; +import javax.faces.component.StateHolder; +import javax.faces.component.behavior.ClientBehavior; +import javax.faces.component.behavior.ClientBehaviorHint; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski + * + * This class is necessary to handle nesting wrapping behaviors properly and is created + * to work around this issue: https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=655 + * + */ + +//TODO - check for bug resolution +final class BehaviorStack { + private static final String BEHAVIOR_STACK = "org.richfaces.BehaviorStack"; + private LinkedList<BehaviorInfo> behaviorStack = null; + + public BehaviorStack() { + behaviorStack = new LinkedList<BehaviorInfo>(); + } + + public static BehaviorStack getBehaviorStack(FacesContext context, boolean createIfNull) { + Map<Object, Object> attributes = context.getAttributes(); + BehaviorStack behaviorStack = (BehaviorStack) attributes.get(BEHAVIOR_STACK); + + if (behaviorStack == null && createIfNull) { + behaviorStack = new BehaviorStack(); + attributes.put(BEHAVIOR_STACK, behaviorStack); + } + + return behaviorStack; + } + + public void addBehaviors(FacesContext context, ClientBehaviorHolder behaviorHolder) { + if (behaviorStack == null || behaviorStack.isEmpty()) { + return; + } + + for (BehaviorInfo behaviorInfo : behaviorStack) { + behaviorInfo.addBehavior(context, behaviorHolder); + } + } + + public void pushBehavior(FacesContext context, ClientBehavior clientBehavior, String behaviorId, String eventName) { + Object behaviorState = ((StateHolder) clientBehavior).saveState(context); + + // closer behaviors are processed earlier + behaviorStack.addFirst(new BehaviorInfo(behaviorId, eventName, behaviorState)); + } + + public void popBehavior() { + if (!behaviorStack.isEmpty()) { + behaviorStack.removeFirst(); + } + } + + private static class BehaviorInfo { + private String behaviorId; + private Object behaviorState; + private String eventName; + + public BehaviorInfo(String behaviorId, String eventName, Object behaviorState) { + this.behaviorId = behaviorId; + this.eventName = eventName; + this.behaviorState = behaviorState; + } + + public void addBehavior(FacesContext context, ClientBehaviorHolder behaviorHolder) { + String eventName = this.eventName; + + if (eventName == null) { + eventName = behaviorHolder.getDefaultEventName(); + + if (eventName == null) { + return; + } + } + + if (shouldAddBehavior(behaviorHolder, eventName)) { + ClientBehavior behavior = createBehavior(context); + + behaviorHolder.addClientBehavior(eventName, behavior); + } + } + + private boolean shouldAddBehavior(ClientBehaviorHolder behaviorHolder, String eventName) { + if (!behaviorHolder.getEventNames().contains(eventName)) { + return false; + } + + Map<String, List<ClientBehavior>> clientBehaviorsMap = behaviorHolder.getClientBehaviors(); + List<ClientBehavior> clientBehaviors = clientBehaviorsMap.get(eventName); + + if (clientBehaviors == null || clientBehaviors.isEmpty()) { + return true; + } + + for (ClientBehavior behavior : clientBehaviors) { + Set<ClientBehaviorHint> hints = behavior.getHints(); + + if (hints.contains(ClientBehaviorHint.SUBMITTING)) { + return false; + } + } + + return true; + } + + private ClientBehavior createBehavior(FacesContext context) { + Application application = context.getApplication(); + ClientBehavior behavior = (ClientBehavior) application.createBehavior(this.behaviorId); + + ((StateHolder) behavior).restoreState(context, behaviorState); + + return behavior; + } + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java (from rev 16764, root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsAddingComponentHandlerWrapper.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + + + +package org.richfaces.taglib.html.facelets; + +import java.io.IOException; + +import javax.el.ELException; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.Tag; +import javax.faces.view.facelets.TagAttribute; + +/** + * @author Nick Belaevski + */ +public class BehaviorsAddingComponentHandlerWrapper extends ComponentHandler { + private ComponentHandler componentHandler; + + public BehaviorsAddingComponentHandlerWrapper(ComponentHandler componentHandler) { + super(componentHandler.getComponentConfig()); + this.componentHandler = componentHandler; + } + + public void apply(FaceletContext ctx, UIComponent parent) throws IOException { + componentHandler.apply(ctx, parent); + } + + public void applyNextHandler(FaceletContext ctx, UIComponent c) throws IOException, FacesException, ELException { + componentHandler.applyNextHandler(ctx, c); + } + + public TagAttribute getBinding() { + return componentHandler.getBinding(); + } + + public ComponentConfig getComponentConfig() { + return componentHandler.getComponentConfig(); + } + + public Tag getTag() { + return componentHandler.getTag(); + } + + public TagAttribute getTagAttribute(String localName) { + return componentHandler.getTagAttribute(localName); + } + + public String getTagId() { + return componentHandler.getTagId(); + } + + public boolean equals(Object obj) { + return componentHandler.equals(obj); + } + + public int hashCode() { + return componentHandler.hashCode(); + } + + public String toString() { + return componentHandler.toString(); + } + + public boolean isDisabled(FaceletContext ctx) { + return componentHandler.isDisabled(ctx); + } + + public void onComponentCreated(FaceletContext ctx, UIComponent c, UIComponent parent) { + componentHandler.onComponentCreated(ctx, c, parent); + } + + public void onComponentPopulated(FaceletContext ctx, UIComponent c, UIComponent parent) { + FacesContext facesContext = ctx.getFacesContext(); + BehaviorStack behaviorStack = BehaviorStack.getBehaviorStack(facesContext, false); + + if (behaviorStack != null) { + if (c instanceof ClientBehaviorHolder) { + ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) c; + + behaviorStack.addBehaviors(facesContext, behaviorHolder); + } + } + + componentHandler.onComponentPopulated(ctx, c, parent); + } + + public void setAttributes(FaceletContext ctx, Object instance) { + componentHandler.setAttributes(ctx, instance); + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java (from rev 16764, root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/BehaviorsTagHandlerDelegateFactoryImpl.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-17 13:25:25 UTC (rev 16772) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + + + +package org.richfaces.taglib.html.facelets; + +import javax.faces.view.facelets.BehaviorHandler; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.ConverterHandler; +import javax.faces.view.facelets.TagHandlerDelegate; +import javax.faces.view.facelets.TagHandlerDelegateFactory; +import javax.faces.view.facelets.ValidatorHandler; + +/** + * @author Nick Belaevski + */ +public class BehaviorsTagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory { + private TagHandlerDelegateFactory factory; + + public BehaviorsTagHandlerDelegateFactoryImpl(TagHandlerDelegateFactory factory) { + this.factory = factory; + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createBehaviorHandlerDelegate(javax.faces.view.facelets.BehaviorHandler) + */ + @Override + public TagHandlerDelegate createBehaviorHandlerDelegate(BehaviorHandler owner) { + return factory.createBehaviorHandlerDelegate(owner); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createComponentHandlerDelegate(javax.faces.view.facelets.ComponentHandler) + */ + @Override + public TagHandlerDelegate createComponentHandlerDelegate(ComponentHandler owner) { + + // TagHandlers structure is created when view is compiled + // so there's no need to check for BehaviorsStack + return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner)); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createConverterHandlerDelegate(javax.faces.view.facelets.ConverterHandler) + */ + @Override + public TagHandlerDelegate createConverterHandlerDelegate(ConverterHandler owner) { + return factory.createConverterHandlerDelegate(owner); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createValidatorHandlerDelegate(javax.faces.view.facelets.ValidatorHandler) + */ + @Override + public TagHandlerDelegate createValidatorHandlerDelegate(ValidatorHandler owner) { + return factory.createValidatorHandlerDelegate(owner); + } +} Modified: root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-17 13:25:25 UTC (rev 16772) @@ -86,7 +86,7 @@ <tag-name>ajax</tag-name> <behavior> <behavior-id>org.ajax4jsf.behavior.Ajax</behavior-id> - <handler-class>org.ajax4jsf.facelets.tag.AjaxHandler</handler-class> + <handler-class>org.richfaces.taglib.html.facelets.AjaxHandler</handler-class> </behavior> </tag> </facelet-taglib> Modified: root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2010-04-17 13:21:26 UTC (rev 16771) +++ root/ui/trunk/components/core/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2010-04-17 13:25:25 UTC (rev 16772) @@ -12,7 +12,7 @@ </ordering> <factory> - <tag-handler-delegate-factory>org.ajax4jsf.facelets.tag.BehaviorsTagHandlerDelegateFactoryImpl</tag-handler-delegate-factory> + <tag-handler-delegate-factory>org.richfaces.taglib.html.facelets.BehaviorsTagHandlerDelegateFactoryImpl</tag-handler-delegate-factory> </factory> </faces-config> \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16771 - root/examples/trunk/components/core-demo/src/main/webapp.

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

Author: nbelaevski Date: 2010-04-17 09:21:26 -0400 (Sat, 17 Apr 2010) New Revision: 16771 Added: root/examples/trunk/components/core-demo/src/main/webapp/ajax.xhtml Removed: root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml Modified: root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml Log: ajax demo page file renamed Copied: root/examples/trunk/components/core-demo/src/main/webapp/ajax.xhtml (from rev 16770, root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml) =================================================================== --- root/examples/trunk/components/core-demo/src/main/webapp/ajax.xhtml (rev 0) +++ root/examples/trunk/components/core-demo/src/main/webapp/ajax.xhtml 2010-04-17 13:21:26 UTC (rev 16771) @@ -0,0 +1,73 @@ +<!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:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a="http://richfaces.org/a4j"> + <h:head> + Richfaces Ajax Sample + + </h:head> + <h:body> + <script type="text/javascript"> + function selectEventSource(source, borderStyle) { + jQuery(source).css('border', borderStyle); + } + </script> + + <h:form> + <a:status name="ilStatus" startText="...start..." stopText="...stop..." /> + <h:panelGrid columns="2"> + <h:outputText value="a:ajax attached fires ajax submit on 'keyup' event"/> + <h:inputText value="#{supportBean.text1}"> + <a:ajax event="keyup" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"/> + </h:inputText> + </h:panelGrid> + + <h:panelGrid columns="1"> + <h:outputText value="a:ajax for 'keyup' event wrapping several elements" /> + <a:ajax event="keyup" execute="@this" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"> + <h:inputText value="#{supportBean.text1}" /> + <h:inputText value="#{supportBean.text1}" /> + <h:inputText value="#{supportBean.text1}" /> + </a:ajax> + </h:panelGrid> + + <h:panelGrid columns="2" style="border: 1px solid green;"> + <h:outputText value="reRender text1: "/> + <h:outputText id="text1" value="#{supportBean.text1}" /> + + <h:outputText value="Ajax Panel ajaxRendered='true':"/> + <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> + <f:facet name="header">test</f:facet> + <h:outputText value="Ajax Panel ajaxRendered='true':" /> + <h:panelGroup style="padding: 2px;"> + <h:outputText value="#{supportBean.text1}"/> + </h:panelGroup> + </a:outputPanel> + </h:panelGrid> + + <h:panelGrid columns="2"> + <h:outputText value="a:ajax attached fires ajax submit on default event"/> + <h:inputText value="#{supportBean.text2}"> + <a:ajax render="text2" statusId="ilStatus" limitRender="true"/> + </h:inputText> + </h:panelGrid> + + <h:panelGrid columns="2" style="border: 1px solid green;"> + <h:outputText value="reRender text2 limitRender='true': "/> + <h:outputText id="text2" value="#{supportBean.text2}" /> + + <h:outputText value="Ajax Panel shouldn't work coz < a:ajax limitRender='true' /> :"/> + <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> + <h:outputText value="Ajax Panel ajaxRendered='true':" /> + <h:panelGroup style="padding: 2px;"> + <h:outputText value="#{supportBean.text2}"/> + </h:panelGroup> + </a:outputPanel> + </h:panelGrid> + + + </h:form> + </h:body> +</html> \ No newline at end of file Deleted: root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml =================================================================== --- root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml 2010-04-17 13:13:45 UTC (rev 16770) +++ root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml 2010-04-17 13:21:26 UTC (rev 16771) @@ -1,73 +0,0 @@ -<!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:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a="http://richfaces.org/a4j"> - <h:head> - Richfaces Ajax Sample - - </h:head> - <h:body> - <script type="text/javascript"> - function selectEventSource(source, borderStyle) { - jQuery(source).css('border', borderStyle); - } - </script> - - <h:form> - <a:status name="ilStatus" startText="...start..." stopText="...stop..." /> - <h:panelGrid columns="2"> - <h:outputText value="a:ajax attached fires ajax submit on 'keyup' event"/> - <h:inputText value="#{supportBean.text1}"> - <a:ajax event="keyup" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"/> - </h:inputText> - </h:panelGrid> - - <h:panelGrid columns="1"> - <h:outputText value="a:ajax for 'keyup' event wrapping several elements" /> - <a:ajax event="keyup" execute="@this" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"> - <h:inputText value="#{supportBean.text1}" /> - <h:inputText value="#{supportBean.text1}" /> - <h:inputText value="#{supportBean.text1}" /> - </a:ajax> - </h:panelGrid> - - <h:panelGrid columns="2" style="border: 1px solid green;"> - <h:outputText value="reRender text1: "/> - <h:outputText id="text1" value="#{supportBean.text1}" /> - - <h:outputText value="Ajax Panel ajaxRendered='true':"/> - <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> - <f:facet name="header">test</f:facet> - <h:outputText value="Ajax Panel ajaxRendered='true':" /> - <h:panelGroup style="padding: 2px;"> - <h:outputText value="#{supportBean.text1}"/> - </h:panelGroup> - </a:outputPanel> - </h:panelGrid> - - <h:panelGrid columns="2"> - <h:outputText value="a:ajax attached fires ajax submit on default event"/> - <h:inputText value="#{supportBean.text2}"> - <a:ajax render="text2" statusId="ilStatus" limitRender="true"/> - </h:inputText> - </h:panelGrid> - - <h:panelGrid columns="2" style="border: 1px solid green;"> - <h:outputText value="reRender text2 limitRender='true': "/> - <h:outputText id="text2" value="#{supportBean.text2}" /> - - <h:outputText value="Ajax Panel shouldn't work coz < a:ajax limitRender='true' /> :"/> - <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> - <h:outputText value="Ajax Panel ajaxRendered='true':" /> - <h:panelGroup style="padding: 2px;"> - <h:outputText value="#{supportBean.text2}"/> - </h:panelGroup> - </a:outputPanel> - </h:panelGrid> - - - </h:form> - </h:body> -</html> \ No newline at end of file Modified: root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml =================================================================== --- root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml 2010-04-17 13:13:45 UTC (rev 16770) +++ root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml 2010-04-17 13:21:26 UTC (rev 16771) @@ -9,7 +9,7 @@ <center> <h1>Welcome To RichFaces 4.x Core Demo</h1> <ul> - <li><h:link outcome="support">a4j:ajax</h:link></li> + <li><h:link outcome="ajax">a4j:ajax</h:link></li> <li><h:link outcome="button">a4j:commandButton</h:link></li> <li><h:link outcome="link">a4j:commandLink</h:link></li> <li><h:link outcome="log">a4j:log</h:link></li>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16770 - root/examples/trunk/components/core-demo/src/main/webapp.

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

Author: nbelaevski Date: 2010-04-17 09:13:45 -0400 (Sat, 17 Apr 2010) New Revision: 16770 Modified: root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml Log: Added wrapping example for a4j:ajax demo Modified: root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml =================================================================== --- root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml 2010-04-16 15:41:56 UTC (rev 16769) +++ root/examples/trunk/components/core-demo/src/main/webapp/support.xhtml 2010-04-17 13:13:45 UTC (rev 16770) @@ -6,7 +6,7 @@ xmlns:a="http://richfaces.org/a4j"> <h:head> Richfaces Ajax Sample - + </h:head> <h:body> <script type="text/javascript"> @@ -14,7 +14,7 @@ jQuery(source).css('border', borderStyle); } </script> - + <h:form> <a:status name="ilStatus" startText="...start..." stopText="...stop..." /> <h:panelGrid columns="2"> @@ -23,44 +23,51 @@ <a:ajax event="keyup" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"/> </h:inputText> </h:panelGrid> - - - + + <h:panelGrid columns="1"> + <h:outputText value="a:ajax for 'keyup' event wrapping several elements" /> + <a:ajax event="keyup" execute="@this" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"> + <h:inputText value="#{supportBean.text1}" /> + <h:inputText value="#{supportBean.text1}" /> + <h:inputText value="#{supportBean.text1}" /> + </a:ajax> + </h:panelGrid> + <h:panelGrid columns="2" style="border: 1px solid green;"> <h:outputText value="reRender text1: "/> <h:outputText id="text1" value="#{supportBean.text1}" /> - + <h:outputText value="Ajax Panel ajaxRendered='true':"/> <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> <f:facet name="header">test</f:facet> <h:outputText value="Ajax Panel ajaxRendered='true':" /> <h:panelGroup style="padding: 2px;"> <h:outputText value="#{supportBean.text1}"/> - </h:panelGroup> + </h:panelGroup> </a:outputPanel> </h:panelGrid> - + <h:panelGrid columns="2"> <h:outputText value="a:ajax attached fires ajax submit on default event"/> <h:inputText value="#{supportBean.text2}"> <a:ajax render="text2" statusId="ilStatus" limitRender="true"/> </h:inputText> </h:panelGrid> - + <h:panelGrid columns="2" style="border: 1px solid green;"> <h:outputText value="reRender text2 limitRender='true': "/> <h:outputText id="text2" value="#{supportBean.text2}" /> - + <h:outputText value="Ajax Panel shouldn't work coz < a:ajax limitRender='true' /> :"/> <a:outputPanel ajaxRendered="true" style="border: 1px solid red;"> <h:outputText value="Ajax Panel ajaxRendered='true':" /> <h:panelGroup style="padding: 2px;"> <h:outputText value="#{supportBean.text2}"/> - </h:panelGroup> + </h:panelGroup> </a:outputPanel> </h:panelGrid> - - + + </h:form> - </h:body> -</html> \ No newline at end of file + </h:body> +</html> \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16769 - root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit.

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

Author: konstantin.mishin Date: 2010-04-16 11:41:56 -0400 (Fri, 16 Apr 2010) New Revision: 16769 Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java Log: RF-8480 Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-04-16 15:39:25 UTC (rev 16768) +++ root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-04-16 15:41:56 UTC (rev 16769) @@ -229,4 +229,25 @@ assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId)); facesRequest.release(); } + + @Test + public final void testColumnResizing() throws IOException { + FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf"); + facesRequest.withViewId("/extendedDataTableTest.jsf"); + facesRequest.start(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + ViewHandler vh = facesContext.getApplication().getViewHandler(); + ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot() + .getViewId()); + vdl.buildView(facesContext, facesContext.getViewRoot()); + UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() + .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); + Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); + assertNull(column1Attributes.get("width")); + facesRequest.withParameter(component.getClientId(facesContext) + ":wi", "column1:200px"); + renderer.doDecode(facesContext, component); + assertEquals("200px", column1Attributes.get("width")); + facesRequest.release(); + } }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16768 - in root/ui-sandbox/trunk/components/tables/ui/src/test: resources and 1 other directory.

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

Author: konstantin.mishin Date: 2010-04-16 11:39:25 -0400 (Fri, 16 Apr 2010) New Revision: 16768 Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java root/ui-sandbox/trunk/components/tables/ui/src/test/resources/extendedDataTableTest.xhtml Log: RF-7852 Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-04-16 14:13:24 UTC (rev 16767) +++ root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-04-16 15:39:25 UTC (rev 16768) @@ -5,10 +5,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; +import java.util.Map; import javax.faces.application.ViewHandler; import javax.faces.context.FacesContext; @@ -174,4 +176,57 @@ // TODO fail("Not yet implemented"); } + @Test + public final void testFilteringWithoutClean() throws IOException { + FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf"); + facesRequest.withViewId("/extendedDataTableTest.jsf"); + facesRequest.start(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + ViewHandler vh = facesContext.getApplication().getViewHandler(); + ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot() + .getViewId()); + vdl.buildView(facesContext, facesContext.getViewRoot()); + UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() + .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); + Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); + Map<String, Object> column2Attributes = component.findComponent("column2").getAttributes(); + String clientId = component.getClientId(facesContext); + assertNull(column1Attributes.get("filterValue")); + assertEquals("filterValue2", column2Attributes.get("filterValue")); + facesRequest.withParameter(clientId, clientId); + facesRequest.withParameter("rich:filterString", "column1:filterValue1:null"); + renderer.doDecode(facesContext, component); + assertEquals("filterValue1", column1Attributes.get("filterValue")); + assertEquals("filterValue2", column2Attributes.get("filterValue")); + assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId)); + facesRequest.release(); + } + + @Test + public final void testFilteringWithClean() throws IOException { + FacesRequest facesRequest = environment.createFacesRequest("http://localhost/extendedDataTableTest.jsf"); + facesRequest.withViewId("/extendedDataTableTest.jsf"); + facesRequest.start(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + ViewHandler vh = facesContext.getApplication().getViewHandler(); + ViewDeclarationLanguage vdl = vh.getViewDeclarationLanguage(facesContext, facesContext.getViewRoot() + .getViewId()); + vdl.buildView(facesContext, facesContext.getViewRoot()); + UIExtendedDataTable component = (UIExtendedDataTable) facesContext.getViewRoot().findComponent("table"); + ExtendedDataTableRenderer renderer = (ExtendedDataTableRenderer) FacesContext.getCurrentInstance() + .getRenderKit().getRenderer(component.getFamily(), component.getRendererType()); + Map<String, Object> column1Attributes = component.findComponent("column1").getAttributes(); + Map<String, Object> column2Attributes = component.findComponent("column2").getAttributes(); + String clientId = component.getClientId(facesContext); + assertNull(column1Attributes.get("filterValue")); + assertEquals("filterValue2", column2Attributes.get("filterValue")); + facesRequest.withParameter(clientId, clientId); + facesRequest.withParameter("rich:filterString", "column1:filterValue1:true"); + renderer.doDecode(facesContext, component); + assertEquals("filterValue1", column1Attributes.get("filterValue")); + assertNull(column2Attributes.get("filterValue")); + assertTrue(facesContext.getPartialViewContext().getRenderIds().contains(clientId)); + facesRequest.release(); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/resources/extendedDataTableTest.xhtml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/test/resources/extendedDataTableTest.xhtml 2010-04-16 14:13:24 UTC (rev 16767) +++ root/ui-sandbox/trunk/components/tables/ui/src/test/resources/extendedDataTableTest.xhtml 2010-04-16 15:39:25 UTC (rev 16768) @@ -54,7 +54,7 @@ <h:outputText id="footerColumnFacet1" value="footerColumnFacet1"/> </f:facet> </rich:column> - <rich:column id="column2" > + <rich:column id="column2" filterValue="filterValue2"> <f:facet name="header"> <h:outputText id="headerColumnFacet2" value="headerColumnFacet2"/> </f:facet>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16767 - in root/framework/trunk/impl/src: main/java/org/richfaces/context and 1 other directories.

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

Author: nbelaevski Date: 2010-04-16 10:13:24 -0400 (Fri, 16 Apr 2010) New Revision: 16767 Added: root/framework/trunk/impl/src/main/java/org/richfaces/context/IdTreeNode.java Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java root/framework/trunk/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java root/framework/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java root/framework/trunk/impl/src/main/java/org/richfaces/context/IdParser.java root/framework/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java root/framework/trunk/impl/src/test/java/org/richfaces/context/IdParserTest.java Log: https://jira.jboss.org/jira/browse/RF-7856 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -21,6 +21,26 @@ package org.ajax4jsf.renderkit; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import javax.faces.component.NamingContainer; +import javax.faces.component.UIComponent; +import javax.faces.component.UIForm; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.context.PartialResponseWriter; +import javax.faces.context.ResponseWriter; +import javax.servlet.http.HttpServletResponse; + import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxClientBehavior; import org.ajax4jsf.component.AjaxComponent; @@ -36,25 +56,6 @@ import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; -import javax.faces.component.NamingContainer; -import javax.faces.component.UIComponent; -import javax.faces.component.UIForm; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.PartialResponseWriter; -import javax.faces.context.ResponseWriter; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - /** * @author shura * <p/> @@ -346,7 +347,7 @@ // public static AjaxEventOptions buildEventOptions(FacesContext facesContext, // UIComponent uiComponent, Map<String, Object> params) { -// +// // return buildEventOptions(facesContext, uiComponent, params, false); // } @@ -396,7 +397,7 @@ // controlValue = clientId; // parameters.put(controlName, controlValue); // AjaxContext ajaxContext = AjaxContext.getCurrentInstance(facesContext); -// +// // String ajaxActionURL = ajaxContext.getAjaxActionURL(facesContext); // if (omitDefaultActionUrl) { // UIComponent form = getNestingForm(uiComponent); @@ -409,19 +410,19 @@ // // if (ajaxActionURL != null) { // // Setup action URL. For portlet environment, it will be different from -// // page. +// // page. // options.put("actionUrl", ajaxActionURL); // } -// +// // // Add application-wide Ajax parameters // parameters.putAll(ajaxContext.getCommonAjaxParameters()); // // add child parameters // appendParameters(facesContext, uiComponent, parameters); -// +// // if (params != null) { // parameters.putAll(params); // } -// +// // if (!parameters.isEmpty()) { // options.put("parameters", parameters); // } @@ -447,20 +448,20 @@ // if (null != oncomplete) { // options.put(ONCOMPLETE_ATTR_NAME, buildAjaxOncomplete(oncomplete)); // } -// +// // String beforeupdate = getAjaxOnBeforeDomUpdate(uiComponent); // if (null != beforeupdate) { // options.put(ONBEFOREDOMUPDATE_ATTR_NAME, buildAjaxOnBeforeDomUpdate(beforeupdate)); // } -// -// +// +// // String status = getAjaxStatus(uiComponent); // if (null != status) { // options.put("status", status); // } // String queue = (String) componentAttributes.get(AJAX_QUEUE_ATTR); // String implicitQueue = null; -// +// // Integer requestDelay = (Integer) componentAttributes // .get(AJAX_DELAY_ATTR); // if (null != requestDelay && requestDelay.intValue() > 0) { @@ -489,14 +490,14 @@ // if (namespace != null && namespace.length() != 0) { // options.put("namespace", namespace); // } -// +// // String similarityGroupingId = (String) componentAttributes.get(SIMILARITY_GROUPING_ID_ATTR); // if (similarityGroupingId == null || similarityGroupingId.length() == 0) { // similarityGroupingId = clientId; // } else { // similarityGroupingId = externalContext.encodeNamespace(similarityGroupingId); // } -// +// // options.put(SIMILARITY_GROUPING_ID_ATTR, similarityGroupingId); // // // request timeout. @@ -513,7 +514,7 @@ // } // /** // * Create call to Ajax Submit function with first two parameters -// * +// * // * @param uiComponent // * @param facesContext // * @param functionName @@ -655,12 +656,21 @@ } /** + * Split parameter string into array of strings. + * @param valuesSet + * @return + */ + public static String[] asArray(String valuesSet) { + return valuesSet.trim().split("(\\s*,\\s*)|(\\s+)"); + } + + /** * Convert parameter ( Collection, List, array, String, comma-separated - * String ) to list of srings. + * String, whitespace-separate String) to set of strings. * * @param valueToSet - - * obect for convert to List. - * @return - list of strings. + * object for conversion to Set. + * @return - set of strings. */ @SuppressWarnings("unchecked") public static Set<String> asSet(Object valueToSet) { @@ -677,7 +687,13 @@ String areasString = ((String) valueToSet).trim(); if (areasString.contains(",") || areasString.contains(" ")) { - return new LinkedHashSet<String>(Arrays.asList(areasString.split("(\\s*,\\s*)|(\\s+)"))); + String[] values = asArray(areasString); + Set<String> result = new LinkedHashSet<String>(values.length); + for (String value : values) { + result.add(value); + } + + return result; } else { Set<String> areasSet = new LinkedHashSet<String>(5); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -1003,8 +1003,11 @@ result.add(convertedId); } } else { + //TODO - review LOGGER.warn( MessageFormat.format("''{0}'' cannot be resolved in the current context", id)); + + result.add(id); } } } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -160,6 +160,21 @@ return null; } + public ComponentMatcherNode getOrCreateChild(String key, boolean isPatternNode) { + Map<String, ComponentMatcherNode> childrenMap = getOrCreateChildrenMap(isPatternNode); + ComponentMatcherNode childNode = childrenMap.get(key); + if (childNode == null) { + childNode = new ComponentMatcherNode(); + + childNode.setPatternNode(isPatternNode); + childNode.setSource(key); + + addChild(childNode); + } + + return childNode; + } + public void addChild(ComponentMatcherNode child) { child.setParentNode(this); @@ -176,9 +191,11 @@ incrementKidPatternNodesCounter(); } - if (isPatternNode() || this.hasParentPatternNode()) { + if (hasPatternNodeInChain()) { child.setHasParentPatternNode(true); } + + addAllSubtreeIds(child.getSubtreeIds()); } public void removeChild(ComponentMatcherNode child) { @@ -192,6 +209,8 @@ if (child.isPatternNode() || child.hasKidPatternNodes()) { decrementKidPatternNodesCounter(); } + + removeAllSubtreeIds(child.getSubtreeIds()); } else { //TODO - ? } @@ -230,22 +249,60 @@ return hasParentPatternNode; } + public boolean hasPatternNodeInChain() { + return isPatternNode() || hasParentPatternNode(); + } + public Collection<String> getSubtreeIds() { return subtreeIds; } + public void addAllSubtreeIds(Collection<String> ids) { + if (ids != null) { + if (subtreeIds == null) { + subtreeIds = new HashSet<String>(); + } + + subtreeIds.addAll(ids); + + if (parentNode != null) { + parentNode.addAllSubtreeIds(ids); + } + } + } + public void addSubtreeId(String subtreeId) { if (subtreeIds == null) { subtreeIds = new HashSet<String>(); } subtreeIds.add(subtreeId); + + if (parentNode != null) { + parentNode.addSubtreeId(subtreeId); + } } + public void removeAllSubtreeIds(Collection<String> ids) { + if (ids != null) { + if (subtreeIds != null) { + subtreeIds.removeAll(ids); + } + + if (parentNode != null) { + parentNode.removeAllSubtreeIds(ids); + } + } + } + public void removeSubtreeId(String subtreeId) { if (subtreeIds != null) { subtreeIds.remove(subtreeId); } + + if (parentNode != null) { + parentNode.removeSubtreeId(subtreeId); + } } public Map<String, ComponentMatcherNode> getIdChildren() { Modified: root/framework/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -120,6 +121,72 @@ } } + private interface NodeOperationCommand { + + public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern); + + public boolean processLastNode(ComponentMatcherNode lastNode, String fullId); + } + + private NodeOperationCommand addNodeOperation = new NodeOperationCommand() { + + public boolean processLastNode(ComponentMatcherNode lastNode, String fullId) { + if (!directNodesMap.containsKey(fullId)) { + directNodesMap.put(fullId, lastNode); + lastNode.markAdded(); + + ComponentMatcherNode n = lastNode; + int addedSegmentsCount = 0; + while (n != null && addedSegmentsCount < SHORT_ID_IN_CLIENTID_SEGMENTS_NUMBER) { + if (!n.isPatternNode()) { + String shortId = n.getSource(); + if (shortId != null) { + addedSegmentsCount++; + //TODO filter meta component ids + shortIds.add(shortId); + } + } + + n = n.getParentNode(); + } + + if (!lastNode.hasPatternNodeInChain()) { + lastNode.addSubtreeId(fullId); + } + + return true; + } + + return false; + } + + public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern) { + return currentNode.getOrCreateChild(nodeId, isPattern); + } + }; + + private NodeOperationCommand removeNodeOperation = new NodeOperationCommand() { + + public boolean processLastNode(ComponentMatcherNode lastNode, String fullId) { + ComponentMatcherNode node = directNodesMap.remove(fullId); + if (node != null) { + if (!node.hasPatternNodeInChain()) { + node.removeSubtreeId(fullId); + } + + removeNode(node); + + return true; + } + + return false; + } + + public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern) { + return currentNode.getChild(nodeId, isPattern); + } + }; + private IdParser idParser; private boolean limitRender; @@ -179,7 +246,7 @@ this.limitRender = limitRender; } - private IdParser getIdParser(String id) { + private IdParser setupIdParser(String id) { if (idParser == null) { idParser = new IdParser(UINamingContainer.getSeparatorChar(getFacesContext()), META_COMPONENT_SEPARATOR_CHAR); @@ -190,47 +257,22 @@ return idParser; } - private ComponentMatcherNode createNode(String patternId) { + private ComponentMatcherNode findMatchingNode(String clientId) { ComponentMatcherNode node = rootNode; - IdParser idParser = getIdParser(patternId); + IdParser idParser = setupIdParser(clientId); - String idSegment; - while ((idSegment = idParser.nextSegment()) != null) { - boolean isPattern = ANY_WILDCARD.equals(idSegment); - ComponentMatcherNode child = node.getChild(idSegment, isPattern); - if (child == null) { - child = new ComponentMatcherNode(); + while (node != null && idParser.findNext()) { + String componentId = idParser.getComponentId(); + String metadataComponentId = idParser.getMetadataComponentId(); - child.setPatternNode(isPattern); - child.setSource(idSegment); - - node.addChild(child); - } - - node = child; - } - - node.markAdded(); - - return node; - } - - private ComponentMatcherNode findMatchingNode(String clientId) { - ComponentMatcherNode node = rootNode; - - IdParser idParser = getIdParser(clientId); - - while (node != null) { - String idSegment = idParser.nextSegment(); - if (idSegment != null) { - if (idParser.containsSubComponentSeparator()) { - node = node.getChild(idSegment, false); - } else { - node = node.getMatchedChild(idSegment); + if (metadataComponentId != null) { + node = node.getChild(componentId, false); + if (node != null) { + node = node.getChild(metadataComponentId, false); } } else { - break; + node = node.getMatchedChild(componentId); } } @@ -262,77 +304,82 @@ } } - private boolean addNode(String patternId) { - ComponentMatcherNode node = directNodesMap.get(patternId); - if (node == null) { - node = createNode(patternId); - directNodesMap.put(patternId, node); + private boolean invokeNodeOperation(NodeOperationCommand command, ComponentMatcherNode currentNode, + IdTreeNode idTreeNode, StringBuilder sb) { - ComponentMatcherNode n = node; - int addedSegmentsCount = 0; - while (n != null && addedSegmentsCount != SHORT_ID_IN_CLIENTID_SEGMENTS_NUMBER) { - if (!n.isPatternNode()) { - String shortId = n.getSource(); - if (shortId != null) { - int sepIdx = shortId.indexOf(META_COMPONENT_SEPARATOR_CHAR); - if (sepIdx > 0) { - shortId = shortId.substring(0, sepIdx); - } + String componentId = idTreeNode.getComponentId(); + String metadataComponentId = idTreeNode.getMetadataComponentId(); - addedSegmentsCount++; - shortIds.add(shortId); - } - } + ComponentMatcherNode nextNode; - n = n.getParentNode(); + if (metadataComponentId != null) { + nextNode = command.getNextNode(currentNode, componentId, false); + if (nextNode != null) { + nextNode = command.getNextNode(nextNode, metadataComponentId, false); } + } else { + boolean isPattern = ANY_WILDCARD.equals(componentId); + nextNode = command.getNextNode(currentNode, componentId, isPattern); + } - n = node; - if (!n.hasParentPatternNode()) { - n = n.getParentNode(); + boolean result = false; - while (n != null) { - ComponentMatcherNode pNode = n.getParentNode(); - if (pNode != null) { - n.addSubtreeId(patternId); - } + if (nextNode != null) { + final int bufferLength = sb.length(); + if (bufferLength != 0) { + //TODO replace with constant + sb.append(':'); + } + sb.append(componentId); - n = pNode; + List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes(); + if (idTreeChildNodes != null) { + final int newBufferLength = sb.length(); + + for (IdTreeNode idTreeChildNode : idTreeChildNodes) { + result |= invokeNodeOperation(command, nextNode, idTreeChildNode, sb); + + sb.setLength(newBufferLength); } + } else { + result |= command.processLastNode(nextNode, sb.toString()); } - - return true; + sb.setLength(bufferLength); } - return false; + return result; } - private boolean removeNode(String patternId) { - ComponentMatcherNode node = directNodesMap.remove(patternId); - if (node != null) { - ComponentMatcherNode n = node; - if (!n.hasParentPatternNode()) { - n = n.getParentNode(); + private boolean invokeRootNodeOperation(NodeOperationCommand command, IdTreeNode idTreeNode) { + boolean result = false; - while (n != null) { - ComponentMatcherNode pNode = n.getParentNode(); - if (pNode != null) { - n.removeSubtreeId(patternId); - } + List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes(); + if (idTreeChildNodes != null) { + StringBuilder sb = new StringBuilder(); - n = pNode; - } + for (IdTreeNode idTreeChildNode : idTreeChildNodes) { + result |= invokeNodeOperation(command, rootNode, idTreeChildNode, sb); } + } - removeNode(node); + return result; + } - return true; - } + private boolean addNode(String patternId) { + IdTreeNode idTreeNode = new IdTreeNode(); + idTreeNode.appendNodesFromParser(setupIdParser(patternId)); - return false; + return invokeRootNodeOperation(addNodeOperation, idTreeNode); } + private boolean removeNode(String patternId) { + IdTreeNode idTreeNode = new IdTreeNode(); + idTreeNode.appendNodesFromParser(setupIdParser(patternId)); + + return invokeRootNodeOperation(removeNodeOperation, idTreeNode); + } + /** * @see VisitContext#getHints VisitContext.getHints */ @@ -371,25 +418,31 @@ String clientId = buildExtendedClientId(component); ComponentMatcherNode node = findMatchingNode(clientId); + + Collection<String> result = null; + + if (node != null) { if (node.hasKidPatternNodes()) { - return VisitContext.ALL_IDS; + result = VisitContext.ALL_IDS; } else { Collection<String> subtreeIds = node.getSubtreeIds(); if (subtreeIds != null) { - return Collections.unmodifiableCollection(subtreeIds); + result = Collections.unmodifiableCollection(subtreeIds); } else { //TODO nick - this code addresses the case of parent pattern nodes, and can be optimized if (node.hasDirectIdChildren()) { - return VisitContext.ALL_IDS; + result = VisitContext.ALL_IDS; } else { - return Collections.emptySet(); + result = Collections.emptySet(); } } } + } else { + result = Collections.emptySet(); } - return Collections.emptySet(); + return result; } public Collection<String>getDirectSubtreeIdsToVisit(UIComponent component) { Modified: root/framework/trunk/impl/src/main/java/org/richfaces/context/IdParser.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/IdParser.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/IdParser.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -28,134 +28,98 @@ */ final class IdParser { - private boolean isInShortId = true; - private String id; - private int start; + private String componentId; + private String metadataComponentId; + private int idx; - private boolean containsSubComponentSeparator; - private final char namingContainerSeparator; private final char subComponentSeparator; public IdParser(char namingContainerSeparator, char subComponentSeparator) { super(); + this.namingContainerSeparator = namingContainerSeparator; this.subComponentSeparator = subComponentSeparator; } private void reset() { this.id = null; - this.start = 0; + + this.componentId = null; + this.metadataComponentId = null; + this.idx = 0; - this.containsSubComponentSeparator = false; - this.isInShortId = true; } - /** - * <p> - * Finds shortId that satisfies the following conditions: - * </p> - * - * <code> - * nextIdx(c) := { return id.indexOf(c, idx) } - * </code> + public void setId(String id) { + reset(); + this.id = id; + } - * <p></p> - * - * <code> - * shortId := id.substring(idx, Math.min(nextIdx(namingContainerSeparator), nextIdx(subComponentSeparator))) - * </code> - * - * @return - */ - private String findNextInShortId() { - String segment = null; - boolean found = false; + public boolean findNext() { + componentId = null; + metadataComponentId = null; - for (int index = idx; !found && index < id.length(); index++) { - char c = id.charAt(index); - if (c == subComponentSeparator) { - segment = id.substring(start, index); - idx = index + 1; - isInShortId = false; - found = true; - } else if (c == namingContainerSeparator) { - segment = id.substring(start, index); - idx = index + 1; - start = idx; - found = true; - } + if (id == null) { + return false; } - if (!found) { - segment = id.substring(start); - this.id = null; - } + int idLength = id.length(); - return segment; - } + if (idx < idLength) { + boolean foundSeparator = false; - /** - * <p> - * Finds fullId that satisfies the following conditions: - * </p> - * - * <code> - * nextIdx(c) := { return id.indexOf(c, idx) } - * </code> + for (int i = idx; i < idLength && !foundSeparator; i++) { + char c = id.charAt(i); - * <p></p> - * - * <code> - * fullId := id.substring(idx, nextIdx(namingContainerSeparator)) - * </code> - * @return - */ - private String findNextInFullId() { - String segment = null; - int index = id.indexOf(namingContainerSeparator, idx); - if (index < 0) { - segment = id.substring(start); - this.id = null; - } else { - segment = id.substring(start, index); - isInShortId = true; - idx = index + 1; - start = idx; - } + if (c == subComponentSeparator) { + if (componentId == null) { + componentId = id.substring(idx, i); + } + } else if (c == namingContainerSeparator) { + String idSegment = id.substring(idx, i); - return segment; - } + if (componentId == null) { + componentId = idSegment; + } else { + metadataComponentId = idSegment; + } - public void setId(String id) { - reset(); - this.id = id; - } + idx = i + 1; + foundSeparator = true; + } + } - public String nextSegment() { - if (this.id == null) { - reset(); - return null; - } + if (!foundSeparator) { + String idSegment = id.substring(idx, idLength); - containsSubComponentSeparator = !isInShortId; + if (componentId == null) { + componentId = idSegment; + } else { + metadataComponentId = idSegment; + } - String segment = null; - if (isInShortId) { - segment = findNextInShortId(); + idx = idLength; + } + + return true; } else { - segment = findNextInFullId(); + reset(); + return false; } + } - return segment; + public String getComponentId() { + return componentId; } - public boolean containsSubComponentSeparator() { - return containsSubComponentSeparator; + public String getMetadataComponentId() { + return metadataComponentId; } + } \ No newline at end of file Added: root/framework/trunk/impl/src/main/java/org/richfaces/context/IdTreeNode.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/IdTreeNode.java (rev 0) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/IdTreeNode.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -0,0 +1,155 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.richfaces.context; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.ajax4jsf.renderkit.AjaxRendererUtils; + +final class IdTreeNode { + + private static final char LIST_OPENING_CHAR = '['; + + private static final char LIST_CLOSING_CHAR = ']'; + + private String componentId; + + private String metadataComponentId; + + private List<IdTreeNode> childNodes; + + private IdTreeNode(String componentId, String metadataComponentId) { + this.componentId = componentId; + this.metadataComponentId = metadataComponentId; + } + + public IdTreeNode() { + this(null, null); + } + + private void setChildNodes(String[] componentIds) { + childNodes = new ArrayList<IdTreeNode>(componentIds.length); + for (String componentId : componentIds) { + childNodes.add(new IdTreeNode(componentId, null)); + } + } + + private void setChildNode(String componentId, String metadataComponentId) { + childNodes = Collections.singletonList(new IdTreeNode(componentId, metadataComponentId)); + } + + private void appendToStringBuilder(StringBuilder sb, int indentLevel) { + for (int i = 0; i < indentLevel; i++) { + sb.append(' '); + } + sb.append('+'); + + if (componentId != null) { + sb.append(componentId); + + if (metadataComponentId != null) { + sb.append('('); + sb.append(metadataComponentId); + sb.append(')'); + } + + } else { + sb.append("<empty>"); + } + + sb.append('\n'); + + if (childNodes != null) { + for (IdTreeNode childNode : childNodes) { + childNode.appendToStringBuilder(sb, indentLevel + 2); + } + } + } + + public void appendNodesFromParser(IdParser idParser) { + List<IdTreeNode> nodes = Collections.singletonList(this); + + while (idParser.findNext()) { + String componentId = idParser.getComponentId(); + String metadataComponentId = idParser.getMetadataComponentId(); + + int childNodesCount = 0; + + if (metadataComponentId != null) { + for (IdTreeNode node : nodes) { + node.setChildNode(componentId, metadataComponentId); + childNodesCount++; + } + } else { + if (componentId.length() > 2 && componentId.charAt(0) == LIST_OPENING_CHAR && + componentId.charAt(componentId.length() - 1) == LIST_CLOSING_CHAR) { + + String[] split = AjaxRendererUtils.asArray(componentId.substring(1, componentId.length() - 1)); + for (IdTreeNode node : nodes) { + node.setChildNodes(split); + childNodesCount += split.length; + } + } else { + for (IdTreeNode node : nodes) { + node.setChildNode(componentId, null); + childNodesCount++; + } + } + } + + List<IdTreeNode> newNodesList; + if (nodes.size() == 1) { + newNodesList = nodes.get(0).getChildNodes(); + } else { + newNodesList = new ArrayList<IdTreeNode>(childNodesCount); + for (IdTreeNode node : nodes) { + newNodesList.addAll(node.getChildNodes()); + } + } + + nodes = newNodesList; + } + } + + public List<IdTreeNode> getChildNodes() { + return childNodes; + } + + public String getComponentId() { + return componentId; + } + + public String getMetadataComponentId() { + return metadataComponentId; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + appendToStringBuilder(sb, 0); + + return sb.toString(); + } +} Modified: root/framework/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -314,7 +314,7 @@ } private void createView() { - viewRoot = (UIViewRoot) application.createComponent(UIViewRoot.COMPONENT_TYPE); + viewRoot = facesContext.getViewRoot(); createForm(); } @@ -715,5 +715,38 @@ assertEquals(Arrays.asList(), trackingVisitCallback.getVisitedIds()); } + + @Test + public void testVisitMultiple() throws Exception { + createVisitContext(true); + + renderingContext.getIdsToVisit().add("myForm:table:[ 0, 1 ]:nestedTable:[ 1 ]:nestedTableText"); + boolean visitResult = viewRoot.visitTree(renderingContext, trackingVisitCallback); + assertTrue(visitResult); + + assertEquals(Arrays.asList("myForm:table:0:nestedTable:1:nestedTableText", + "myForm:table:1:nestedTable:1:nestedTableText"), trackingVisitCallback.getVisitedIds()); + } + + @Test + public void testVisitMultipleWithPatternAndMetacomponent() throws Exception { + createVisitContext(true); + + renderingContext.getIdsToVisit().add("myForm:table:[ 0, 1 ]:nestedTable:*:nestedTableText"); + renderingContext.getIdsToVisit().add("myForm:table:[0]:nestedTable@footer"); + + viewRoot.visitTree(renderingContext, trackingVisitCallback); + + assertEquals(Arrays.asList( + "myForm:table:0:nestedTable@footer", + "myForm:table:0:nestedTable:0:nestedTableText", + "myForm:table:0:nestedTable:1:nestedTableText", + "myForm:table:0:nestedTable:2:nestedTableText", + + "myForm:table:1:nestedTable:0:nestedTableText", + "myForm:table:1:nestedTable:1:nestedTableText", + "myForm:table:1:nestedTable:2:nestedTableText" + ), trackingVisitCallback.getVisitedIds()); + } } Modified: root/framework/trunk/impl/src/test/java/org/richfaces/context/IdParserTest.java =================================================================== --- root/framework/trunk/impl/src/test/java/org/richfaces/context/IdParserTest.java 2010-04-16 10:31:58 UTC (rev 16766) +++ root/framework/trunk/impl/src/test/java/org/richfaces/context/IdParserTest.java 2010-04-16 14:13:24 UTC (rev 16767) @@ -50,121 +50,114 @@ } @Test - public void testEmptyString() throws Exception { + public void testIncorrectIds() throws Exception { idParser.setId(""); - String segment; + idParser.findNext(); + assertFalse(idParser.findNext()); - segment = idParser.nextSegment(); - assertEquals("", segment); - assertFalse(idParser.containsSubComponentSeparator()); - assertNull(idParser.nextSegment()); + idParser.setId(":test"); + + idParser.findNext(); + idParser.findNext(); + assertFalse(idParser.findNext()); + + idParser.setId("test:"); + + idParser.findNext(); + idParser.findNext(); + assertFalse(idParser.findNext()); + + idParser.setId("@head"); + + idParser.findNext(); + assertFalse(idParser.findNext()); + + idParser.setId("head@"); + + idParser.findNext(); + assertFalse(idParser.findNext()); } @Test public void testSimpleId() throws Exception { idParser.setId("simpleId"); - String segment; + assertTrue(idParser.findNext()); + assertEquals("simpleId", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("simpleId", segment); - assertFalse(idParser.containsSubComponentSeparator()); - assertNull(idParser.nextSegment()); + assertFalse(idParser.findNext()); } @Test public void testSubComponentId() throws Exception { idParser.setId("table@head"); - String segment; + assertTrue(idParser.findNext()); + assertEquals("table@head", idParser.getMetadataComponentId()); + assertEquals("table", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("table", segment); - assertFalse(idParser.containsSubComponentSeparator()); - - segment = idParser.nextSegment(); - assertEquals("table@head", segment); - assertTrue(idParser.containsSubComponentSeparator()); - - assertNull(idParser.nextSegment()); + assertFalse(idParser.findNext()); } @Test public void testSeries() throws Exception { idParser.setId("form:table:0:nestedTable@body"); - String segment; + assertTrue(idParser.findNext()); + assertEquals("form", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("form", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("table", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("table", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("0", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("0", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("nestedTable@body", idParser.getMetadataComponentId()); + assertEquals("nestedTable", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("nestedTable", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertFalse(idParser.findNext()); - segment = idParser.nextSegment(); - assertEquals("nestedTable@body", segment); - assertTrue(idParser.containsSubComponentSeparator()); - - assertNull(idParser.nextSegment()); - idParser.setId("myBigTable@header"); - segment = idParser.nextSegment(); - assertEquals("myBigTable", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("myBigTable@header", idParser.getMetadataComponentId()); + assertEquals("myBigTable", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("myBigTable@header", segment); - assertTrue(idParser.containsSubComponentSeparator()); + assertFalse(idParser.findNext()); - assertNull(idParser.nextSegment()); - idParser.setId("tree:0-12-28:node@status:table:10:tab@label"); - segment = idParser.nextSegment(); - assertEquals("tree", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("tree", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("0-12-28", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("0-12-28", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("node", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("node@status", idParser.getMetadataComponentId()); + assertEquals("node", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("node@status", segment); - assertTrue(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("table", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("table", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("10", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("10", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("tab@label", idParser.getMetadataComponentId()); + assertEquals("tab", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("tab", segment); - assertFalse(idParser.containsSubComponentSeparator()); - - segment = idParser.nextSegment(); - assertEquals("tab@label", segment); - assertTrue(idParser.containsSubComponentSeparator()); - - assertNull(idParser.nextSegment()); + assertFalse(idParser.findNext()); } @Test @@ -173,24 +166,18 @@ idParser.setId("form:table@head@x-head:child"); - String segment; + assertTrue(idParser.findNext()); + assertEquals("form", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("form", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("table@head@x-head", idParser.getMetadataComponentId()); + assertEquals("table", idParser.getComponentId()); - segment = idParser.nextSegment(); - assertEquals("table", segment); - assertFalse(idParser.containsSubComponentSeparator()); + assertTrue(idParser.findNext()); + assertEquals("child", idParser.getComponentId()); + assertNull(idParser.getMetadataComponentId()); - segment = idParser.nextSegment(); - assertEquals("table@head@x-head", segment); - assertTrue(idParser.containsSubComponentSeparator()); - - segment = idParser.nextSegment(); - assertEquals("child", segment); - assertFalse(idParser.containsSubComponentSeparator()); - - assertNull(idParser.nextSegment()); + assertFalse(idParser.findNext()); } }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16766 - in branches/community/3.3.X: cdk and 221 other directories.

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

Author: konstantin.mishin Date: 2010-04-16 06:31:58 -0400 (Fri, 16 Apr 2010) New Revision: 16766 Modified: branches/community/3.3.X/cdk/generator/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml branches/community/3.3.X/cdk/pom.xml branches/community/3.3.X/cdk/richfaces-facelets/pom.xml branches/community/3.3.X/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/docs/cdkguide/en/pom.xml branches/community/3.3.X/docs/cdkguide/pom.xml branches/community/3.3.X/docs/common-resources/en/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/docs/common-resources/pom.xml branches/community/3.3.X/docs/faq/en/pom.xml branches/community/3.3.X/docs/faq/pom.xml branches/community/3.3.X/docs/highlight/pom.xml branches/community/3.3.X/docs/migrationguide/en/pom.xml branches/community/3.3.X/docs/migrationguide/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/en/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/application_overview.xml branches/community/3.3.X/docs/photo_album_app_guide/pom.xml branches/community/3.3.X/docs/pom.xml branches/community/3.3.X/docs/userguide/en/pom.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml branches/community/3.3.X/docs/userguide/pom.xml branches/community/3.3.X/examples/photoalbum/assembly/pom.xml branches/community/3.3.X/examples/photoalbum/pom.xml branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/examples/photoalbum/tests/pom.xml branches/community/3.3.X/extensions/gwt/pom.xml branches/community/3.3.X/extensions/pom.xml branches/community/3.3.X/extensions/seam/pom.xml branches/community/3.3.X/extensions/trinidad/pom.xml branches/community/3.3.X/framework/api/pom.xml branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java branches/community/3.3.X/framework/jsf-test/pom.xml branches/community/3.3.X/framework/pom.xml branches/community/3.3.X/framework/test/pom.xml branches/community/3.3.X/pom.xml branches/community/3.3.X/samples/beanValidatorSample/pom.xml branches/community/3.3.X/samples/calendar-sample/pom.xml branches/community/3.3.X/samples/colorPickerDemo/pom.xml branches/community/3.3.X/samples/columnsDemo/pom.xml branches/community/3.3.X/samples/combobox-sample/pom.xml branches/community/3.3.X/samples/contextMenuDemo/pom.xml branches/community/3.3.X/samples/createProject.sh branches/community/3.3.X/samples/darkX/pom.xml branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml branches/community/3.3.X/samples/dataTableDemo/pom.xml branches/community/3.3.X/samples/datascroller-sample/pom.xml branches/community/3.3.X/samples/dragDropDemo/pom.xml branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml branches/community/3.3.X/samples/editor-sample/pom.xml branches/community/3.3.X/samples/editorSeam-sample/pom.xml branches/community/3.3.X/samples/effect-sample/pom.xml branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml branches/community/3.3.X/samples/fileUploadDemo/pom.xml branches/community/3.3.X/samples/functions-demo/pom.xml branches/community/3.3.X/samples/glassX/pom.xml branches/community/3.3.X/samples/gmap-sample/pom.xml branches/community/3.3.X/samples/hotKey-sample/pom.xml branches/community/3.3.X/samples/inplaceInput-sample/pom.xml branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml branches/community/3.3.X/samples/jQuery-sample/pom.xml branches/community/3.3.X/samples/jira-data/pom.xml branches/community/3.3.X/samples/laguna/pom.xml branches/community/3.3.X/samples/layout-sample/pom.xml branches/community/3.3.X/samples/listShuttleDemo/pom.xml branches/community/3.3.X/samples/local-value-demo/pom.xml branches/community/3.3.X/samples/mediaOutput/pom.xml branches/community/3.3.X/samples/modalpanel-sample/pom.xml branches/community/3.3.X/samples/orderingListDemo/pom.xml branches/community/3.3.X/samples/panel-sample/pom.xml branches/community/3.3.X/samples/panelbar-sample/pom.xml branches/community/3.3.X/samples/panelmenu-sample/pom.xml branches/community/3.3.X/samples/pickList-sample/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/progressBarDemo/pom.xml branches/community/3.3.X/samples/queue-sample/pom.xml branches/community/3.3.X/samples/rich-message-demo/pom.xml branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml branches/community/3.3.X/samples/seamEAR/ear/pom.xml branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml branches/community/3.3.X/samples/seamEAR/pom.xml branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml branches/community/3.3.X/samples/seamEAR/projects/pom.xml branches/community/3.3.X/samples/seamEAR/wars/pom.xml branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml branches/community/3.3.X/samples/seamIntegration/pom.xml branches/community/3.3.X/samples/separator-sample/pom.xml branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml branches/community/3.3.X/samples/skins/pom.xml branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml branches/community/3.3.X/samples/state-sample/pom.xml branches/community/3.3.X/samples/stdcomponents-sample/pom.xml branches/community/3.3.X/samples/suggestionbox-sample/pom.xml branches/community/3.3.X/samples/tabPanelDemo/pom.xml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/samples/togglePanel-sample/pom.xml branches/community/3.3.X/samples/tomahawkCompability/pom.xml branches/community/3.3.X/samples/toolBarDemo/pom.xml branches/community/3.3.X/samples/tooltip-sample/pom.xml branches/community/3.3.X/samples/tree-demo/pom.xml branches/community/3.3.X/samples/treeModelDemo/pom.xml branches/community/3.3.X/samples/violetRays/pom.xml branches/community/3.3.X/samples/virtualEarth-sample/pom.xml branches/community/3.3.X/sandbox/api/pom.xml branches/community/3.3.X/sandbox/cdk/pom.xml branches/community/3.3.X/sandbox/impl/pom.xml branches/community/3.3.X/sandbox/pom.xml branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml branches/community/3.3.X/sandbox/samples/pom.xml branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml branches/community/3.3.X/sandbox/ui/create.bat branches/community/3.3.X/sandbox/ui/create.sh branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml branches/community/3.3.X/sandbox/ui/editorOld/pom.xml branches/community/3.3.X/sandbox/ui/panel2/pom.xml branches/community/3.3.X/sandbox/ui/pom.xml branches/community/3.3.X/sandbox/ui/rex-button/pom.xml branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml branches/community/3.3.X/sandbox/ui/treeTable/pom.xml branches/community/3.3.X/test-applications/ajaxTest/pom.xml branches/community/3.3.X/test-applications/automator/pom.xml branches/community/3.3.X/test-applications/facelets/pom.xml branches/community/3.3.X/test-applications/jsp/pom.xml branches/community/3.3.X/test-applications/pom.xml branches/community/3.3.X/test-applications/regression-test/pom.xml branches/community/3.3.X/test-applications/regressionArea/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml branches/community/3.3.X/test-applications/richfaces-docs/pom.xml branches/community/3.3.X/test-applications/seamApp/pom.xml branches/community/3.3.X/test-applications/seleniumTest/pom.xml branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml branches/community/3.3.X/test-applications/test-jsp/pom.xml branches/community/3.3.X/ui/assembly/pom.xml branches/community/3.3.X/ui/beanValidator/pom.xml branches/community/3.3.X/ui/calendar/pom.xml branches/community/3.3.X/ui/colorPicker/pom.xml branches/community/3.3.X/ui/columns/pom.xml branches/community/3.3.X/ui/combobox/pom.xml branches/community/3.3.X/ui/componentControl/pom.xml branches/community/3.3.X/ui/contextMenu/pom.xml branches/community/3.3.X/ui/core/pom.xml branches/community/3.3.X/ui/create.bat branches/community/3.3.X/ui/dataFilterSlider/pom.xml branches/community/3.3.X/ui/dataTable/pom.xml branches/community/3.3.X/ui/datascroller/pom.xml branches/community/3.3.X/ui/drag-drop/pom.xml branches/community/3.3.X/ui/dropdown-menu/pom.xml branches/community/3.3.X/ui/editor/pom.xml branches/community/3.3.X/ui/effect/pom.xml branches/community/3.3.X/ui/extendedDataTable/pom.xml branches/community/3.3.X/ui/fileUpload/pom.xml branches/community/3.3.X/ui/functions/pom.xml branches/community/3.3.X/ui/gmap/pom.xml branches/community/3.3.X/ui/hotKey/pom.xml branches/community/3.3.X/ui/inplaceInput/pom.xml branches/community/3.3.X/ui/inplaceSelect/pom.xml branches/community/3.3.X/ui/inputnumber-slider/pom.xml branches/community/3.3.X/ui/inputnumber-spinner/pom.xml branches/community/3.3.X/ui/insert/pom.xml branches/community/3.3.X/ui/jQuery/pom.xml branches/community/3.3.X/ui/layout/pom.xml branches/community/3.3.X/ui/listShuttle/pom.xml branches/community/3.3.X/ui/menu-components/pom.xml branches/community/3.3.X/ui/message/pom.xml branches/community/3.3.X/ui/modal-panel/pom.xml branches/community/3.3.X/ui/orderingList/pom.xml branches/community/3.3.X/ui/paint2D/pom.xml branches/community/3.3.X/ui/panel/pom.xml branches/community/3.3.X/ui/panelbar/pom.xml branches/community/3.3.X/ui/panelmenu/pom.xml branches/community/3.3.X/ui/pickList/pom.xml branches/community/3.3.X/ui/pom.xml branches/community/3.3.X/ui/progressBAR/pom.xml branches/community/3.3.X/ui/scrollableDataTable/pom.xml branches/community/3.3.X/ui/separator/pom.xml branches/community/3.3.X/ui/simpleTogglePanel/pom.xml branches/community/3.3.X/ui/spacer/pom.xml branches/community/3.3.X/ui/state/pom.xml branches/community/3.3.X/ui/suggestionbox/pom.xml branches/community/3.3.X/ui/tabPanel/pom.xml branches/community/3.3.X/ui/togglePanel/pom.xml branches/community/3.3.X/ui/toolBar/pom.xml branches/community/3.3.X/ui/tooltip/pom.xml branches/community/3.3.X/ui/tree/pom.xml branches/community/3.3.X/ui/treeModel/pom.xml branches/community/3.3.X/ui/treeTable/pom.xml branches/community/3.3.X/ui/virtualEarth/pom.xml Log: change version form 3.3.3-SNAPSHOT to 3.3.4-SNAPSHOT Modified: branches/community/3.3.X/cdk/generator/pom.xml =================================================================== --- branches/community/3.3.X/cdk/generator/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/generator/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Java Server Faces component generator</name> <build> <plugins> Modified: branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -11,7 +11,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <configuration> <library> <prefix>${groupId}</prefix> @@ -41,7 +41,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -30,12 +30,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-plug-n-skin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Archetype - maven-archetype-plug-n-skin</name> Modified: branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -34,7 +34,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-seam-app</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Archetype - maven-archetype-seam-app</name> </project> \ No newline at end of file Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>${artifactId}</projectName> - <richfacesVersion>3.3.3-SNAPSHOT</richfacesVersion> + <richfacesVersion>3.3.4-SNAPSHOT</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.3.GA/jboss-4.2.3.GA/server/default/</jbossDeployDir> Modified: branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-theme</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>maven-archetype-theme</name> <build> Modified: branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -41,12 +41,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -12,7 +12,7 @@ <artifactId>maven-resource-dependency-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>maven-resource-dependency-plugin</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/cdk/pom.xml =================================================================== --- branches/community/3.3.X/cdk/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/community/3.3.X/cdk/richfaces-facelets/pom.xml =================================================================== --- branches/community/3.3.X/cdk/richfaces-facelets/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/richfaces-facelets/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>richfaces-facelets</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>maven-archetype-rf-facelets</name> <packaging>maven-archetype</packaging> <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <build> Modified: branches/community/3.3.X/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -28,7 +28,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: branches/community/3.3.X/docs/cdkguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/cdkguide/en/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.cdkguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces CDK Developer Guide (${translation})</name> Modified: branches/community/3.3.X/docs/cdkguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/cdkguide/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>cdkguide</name> <description>Richfaces CDK Developer Guide</description> <pluginRepositories> Modified: branches/community/3.3.X/docs/common-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/common-resources/en/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>common-resources</artifactId> <groupId>org.richfaces.docs</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.common-resources</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>Documentation common resources (${translation})</name> <description> @@ -17,7 +17,7 @@ <dependency> <groupId>org.richfaces.docs</groupId> <artifactId>highlight</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> <build> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <artifactId>richfacesguide-archetype</artifactId> <packaging>maven-archetype</packaging> <name>richfacesguide-archetype</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <extensions> <extension> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.richfacesguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Guide Template</name> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>richfacesguide</name> <description>Richfaces Guide Template</description> <pluginRepositories> Modified: branches/community/3.3.X/docs/common-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/common-resources/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>common-resources</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Documentation common resources</name> <description>Common resources</description> Modified: branches/community/3.3.X/docs/faq/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/en/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/faq/en/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.faq</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> <build> Modified: branches/community/3.3.X/docs/faq/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/faq/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>FAQ</name> <description>Frequently asked questions</description>  Modified: branches/community/3.3.X/docs/userguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/userguide/en/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -335,7 +335,7 @@ <para>Now you have everything to create the project using the "maven-archetype-jsfwebapp" archetype. Create a folder that will house your project and run the this command in it:</para> <programlisting role="XML" ><![CDATA[... -mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.docs.richfaces -DartifactId=jsf-app +mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.4-SNAPSHOT -DgroupId=org.docs.richfaces -DartifactId=jsf-app ...]]></programlisting> @@ -461,17 +461,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> ...]]></programlisting> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3839,7 +3839,7 @@ <listitem> <para> <code>archetypeVersion</code> indicates the RichFaces version. For example, - <code>"3.3.3-SNAPSHOT"</code> + <code>"3.3.4-SNAPSHOT"</code> </para> </listitem> <listitem> @@ -4080,7 +4080,7 @@ follow the steps described in the previous section.</para> <para>This command will be used to create a template of the new skin project. </para> <programlisting role="XML"><![CDATA[ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin -DarchetypeVersion=3.3.3-SNAPSHOT -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin -DarchetypeVersion=3.3.4-SNAPSHOT -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT ]]></programlisting> <para> Now you can browse the "P-n-S" folder to view what files and folders were created there. </para> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -48,7 +48,7 @@ RichFaces components are available on<ulink url="http://livedemo.exadel.com/richfaces-demo/">RichFaces Live Demo</ulink>.</para> <para>War file of a nightly build can be found on the <ulink - url="http://snapshots.jboss.org/maven2/org/richfaces/ui/richfaces-ui/3.3.3-SNA..." + url="http://snapshots.jboss.org/maven2/org/richfaces/ui/richfaces-ui/3.3.4-SNA..." >Snapshots repository</ulink>.</para> <para>Source Code (SVN) can be found in<ulink url="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/richfaces-demo/" Modified: branches/community/3.3.X/docs/userguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/docs/userguide/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> Modified: branches/community/3.3.X/examples/photoalbum/assembly/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/assembly/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/assembly/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Photoalbum Demo Application Root</name> <modules> Modified: branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -8,7 +8,7 @@ <artifactId>photoalbum</artifactId> <packaging>pom</packaging> <name>${appName}</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <distributionManagement> <downloadUrl> Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/examples/photoalbum/tests/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/community/3.3.X/extensions/gwt/pom.xml =================================================================== --- branches/community/3.3.X/extensions/gwt/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/extensions/gwt/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: branches/community/3.3.X/extensions/pom.xml =================================================================== --- branches/community/3.3.X/extensions/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/extensions/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>extensions</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Richfaces extensions for a different environments</name> <packaging>pom</packaging> <modules> Modified: branches/community/3.3.X/extensions/seam/pom.xml =================================================================== --- branches/community/3.3.X/extensions/seam/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/extensions/seam/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: branches/community/3.3.X/extensions/trinidad/pom.xml =================================================================== --- branches/community/3.3.X/extensions/trinidad/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/extensions/trinidad/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: branches/community/3.3.X/framework/api/pom.xml =================================================================== --- branches/community/3.3.X/framework/api/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/api/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <dependencies> <dependency> Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/impl/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>${classifiedArtifactId}</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <resources> <resource> @@ -294,7 +294,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java 2010-04-16 10:31:58 UTC (rev 16766) @@ -37,7 +37,7 @@ /** * Revision version, must be auto modified by CVS */ - public static final String REVISION = "3-SNAPSHOT" ; + public static final String REVISION = "4-SNAPSHOT" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version(); Modified: branches/community/3.3.X/framework/jsf-test/pom.xml =================================================================== --- branches/community/3.3.X/framework/jsf-test/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/jsf-test/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,13 +4,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <dependencies> <dependency> Modified: branches/community/3.3.X/framework/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> Modified: branches/community/3.3.X/framework/test/pom.xml =================================================================== --- branches/community/3.3.X/framework/test/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/framework/test/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,12 +3,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> Modified: branches/community/3.3.X/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <artifactId>root</artifactId> <packaging>pom</packaging> <name>RichFaces project</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> Modified: branches/community/3.3.X/samples/beanValidatorSample/pom.xml =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>beanValidatorSample</artifactId> <packaging>war</packaging> <name>beanValidatorSample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <finalName>richfaces-validator</finalName> <plugins> @@ -34,7 +34,7 @@  <dependency> <groupId>org.slf4j</groupId> @@ -50,12 +50,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> Modified: branches/community/3.3.X/samples/calendar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/calendar-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/calendar-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/colorPickerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -40,17 +40,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>colorPicker</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/community/3.3.X/samples/columnsDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/columnsDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/columnsDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/combobox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/combobox-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/combobox-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/contextMenuDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/contextMenuDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/contextMenuDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/createProject.sh =================================================================== --- branches/community/3.3.X/samples/createProject.sh 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/createProject.sh 2010-04-16 10:31:58 UTC (rev 16766) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ - -DarchetypeVersion=3.3.3-SNAPSHOT -Dversion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.samples -DartifactId=$1 + -DarchetypeVersion=3.3.4-SNAPSHOT -Dversion=3.3.4-SNAPSHOT -DgroupId=org.richfaces.samples -DartifactId=$1 Modified: branches/community/3.3.X/samples/darkX/pom.xml =================================================================== --- branches/community/3.3.X/samples/darkX/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/darkX/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataTableDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/dataTableDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/datascroller-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/datascroller-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/datascroller-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dragDropDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dragDropDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/dragDropDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/editor-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editor-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/editor-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/samples/editorSeam-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editorSeam-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/editorSeam-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/samples/effect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/effect-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/effect-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/fileUploadDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/fileUploadDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/fileUploadDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/functions-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/functions-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/functions-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/glassX/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> <name>glassX</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/samples/gmap-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/gmap-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/gmap-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/hotKey-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/hotKey-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/hotKey-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/inplaceInput-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceInput-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/inplaceInput-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/jQuery-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/jQuery-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/jQuery-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/jira-data/pom.xml =================================================================== --- branches/community/3.3.X/samples/jira-data/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/jira-data/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/laguna/pom.xml =================================================================== --- branches/community/3.3.X/samples/laguna/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/laguna/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <configuration> <name>org.richfaces.laguna</name> </configuration> Modified: branches/community/3.3.X/samples/layout-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/layout-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/layout-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>layout-sample</artifactId> <packaging>war</packaging> <name>layout Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <finalName>layout-sample</finalName> <plugins> @@ -34,17 +34,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/samples/listShuttleDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/listShuttleDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/listShuttleDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/local-value-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/local-value-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/local-value-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/mediaOutput/pom.xml =================================================================== --- branches/community/3.3.X/samples/mediaOutput/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/mediaOutput/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,11 +5,11 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces</groupId> <artifactId>mediaOutput</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>war</packaging> <name>mediaOutput Maven Webapp</name> <build> Modified: branches/community/3.3.X/samples/modalpanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/modalpanel-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/modalpanel-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/orderingListDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/orderingListDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/orderingListDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panel-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/panel-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panelbar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelbar-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/panelbar-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/panelmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelmenu-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/panelmenu-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/pickList-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/pickList-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/pickList-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/samples/progressBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/progressBarDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/progressBarDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/queue-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/queue-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/queue-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>queue-sample</artifactId> <packaging>war</packaging> <name>queue-sample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <finalName>queue-sample</finalName> <plugins> Modified: branches/community/3.3.X/samples/rich-message-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/rich-message-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/rich-message-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.richfaces.integrationTest</groupId> <artifactId>functional-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>selenium-test</name> <url>http://maven.apache.org</url> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -246,22 +246,22 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>laguna</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>darkX</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -360,12 +360,12 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.persistence</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>scrollableDataTableDemo</artifactId> Modified: branches/community/3.3.X/samples/seamEAR/ear/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ear/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/ear/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <dependencies> <dependency> Modified: branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,6 +7,6 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>projects</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> </project> Modified: branches/community/3.3.X/samples/seamEAR/projects/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/projects/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modules> <module>logging</module> Modified: branches/community/3.3.X/samples/seamEAR/wars/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/wars/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modules> <module>seamWebapp</module> Modified: branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>wars</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <build> <finalName>seamWebapp</finalName> @@ -22,17 +22,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/community/3.3.X/samples/seamIntegration/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamIntegration/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/seamIntegration/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/separator-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/separator-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/separator-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/skins/pom.xml =================================================================== --- branches/community/3.3.X/samples/skins/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/skins/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@  <dependency> Modified: branches/community/3.3.X/samples/state-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/state-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/state-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>state</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/stdcomponents-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/stdcomponents-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/stdcomponents-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/suggestionbox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/suggestionbox-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/suggestionbox-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tabPanelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tabPanelDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/tabPanelDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/themes/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>themes</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/samples/togglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/togglePanel-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/togglePanel-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tomahawkCompability/pom.xml =================================================================== --- branches/community/3.3.X/samples/tomahawkCompability/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/tomahawkCompability/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/toolBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/toolBarDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/toolBarDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tooltip-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/tooltip-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/tooltip-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/tree-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tree-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/tree-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/treeModelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/treeModelDemo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/treeModelDemo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/violetRays/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>violetRays</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/samples/virtualEarth-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/virtualEarth-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/samples/virtualEarth-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/community/3.3.X/sandbox/api/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/api/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/api/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,13 +2,13 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> @@ -25,12 +25,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/sandbox/cdk/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/cdk/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/cdk/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>cdk</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/community/3.3.X/sandbox/impl/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/impl/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/impl/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,28 +2,28 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> <name>Richfaces Sandbox Implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/sandbox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk.sandbox</groupId> <artifactId>maven-rd-plugin-sample</artifactId> <packaging>war</packaging> <name>maven-rd-plugin-sample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <pluginRepositories> <pluginRepository> @@ -33,7 +33,7 @@ <plugin> <artifactId>maven-resource-dependency-plugin</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <configuration> <scriptFilePath>scripts/custom-dependencies.js</scriptFilePath> <styleFilePath>css/custom-dependencies.xcss</styleFilePath> @@ -59,7 +59,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -178,7 +178,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -193,28 +193,28 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-resizable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-button</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-messageBox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> Modified: branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/community/3.3.X/sandbox/ui/create.bat =================================================================== --- branches/community/3.3.X/sandbox/ui/create.bat 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/create.bat 2010-04-16 10:31:58 UTC (rev 16766) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.4-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/create.sh =================================================================== --- branches/community/3.3.X/sandbox/ui/create.sh 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/create.sh 2010-04-16 10:31:58 UTC (rev 16766) @@ -1,2 +1,2 @@ #!/bin/sh -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.4-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -39,12 +39,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/3.3.X/sandbox/ui/editorOld/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/editorOld/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/editorOld/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/panel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/panel2/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/panel2/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -3,7 +3,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: branches/community/3.3.X/sandbox/ui/rex-button/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-button/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/rex-button/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>sortableHeader</artifactId> <name>sortableHeader</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -52,17 +52,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/sandbox/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/treeTable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/sandbox/ui/treeTable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/test-applications/ajaxTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.el</groupId> Modified: branches/community/3.3.X/test-applications/automator/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/automator/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/automator/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/facelets/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/facelets/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/facelets/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/jsp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/jsp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/test-applications/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <relativePath>../samples</relativePath> </parent> @@ -50,11 +50,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.4-SNAPSHOT</rfVersion> </properties> <modules> Modified: branches/community/3.3.X/test-applications/regression-test/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regression-test/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,7 +5,7 @@ <artifactId>regression-test</artifactId> <name>Regression test application</name> <packaging>war</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <description>Application for manual testing of regressions.</description> <url>http://www.jboss.org/richfaces</url> <inceptionYear>2009</inceptionYear> Modified: branches/community/3.3.X/test-applications/regressionArea/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regressionArea/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,12 +4,12 @@  <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Regresion Area:Seam Application</name> <repositories> <repository> @@ -36,7 +36,7 @@ <properties> <contextroot>regressionArea</contextroot> <earname>regressionArea-ear</earname> - <richversion>3.3.3-SNAPSHOT</richversion> + <richversion>3.3.4-SNAPSHOT</richversion> <seamversion>2.1.1.GA</seamversion> <jsfversion>1.2_11</jsfversion> <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ear</artifactId> <name>Regression Area Ear Module</name> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>regressionArea</artifactId> <groupId>org.richfaces.test-applications</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.test-applications.regressionArea</groupId> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-web</artifactId> Modified: branches/community/3.3.X/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -204,7 +204,7 @@ <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> @@ -214,7 +214,7 @@ <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> @@ -224,7 +224,7 @@ <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> Modified: branches/community/3.3.X/test-applications/seamApp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/seamApp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>seamApp</projectName> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.4-SNAPSHOT</rfVersion> <seamVersion>2.1.0.SP1</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,14 +5,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> <packaging>pom</packaging> <name>SeleniumTest</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <url>http://maven.apache.org</url> <properties> <http.port>8085</http.port> @@ -233,7 +233,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,14 +5,14 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>richfaces</artifactId> <packaging>war</packaging> <name>seleniumTest Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <finalName>richfaces</finalName> </build> Modified: branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -5,13 +5,13 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>samples</artifactId> <name>Samples</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <finalName>seleniumTest</finalName> <plugins> Modified: branches/community/3.3.X/test-applications/test-jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/test-applications/test-jsp/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/3.3.X/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/assembly/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -435,17 +435,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-jsf2</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </profile> Modified: branches/community/3.3.X/ui/beanValidator/pom.xml =================================================================== --- branches/community/3.3.X/ui/beanValidator/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/beanValidator/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,19 +4,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>beanValidator</artifactId> <name>beanValidator</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.hibernate</groupId> Modified: branches/community/3.3.X/ui/calendar/pom.xml =================================================================== --- branches/community/3.3.X/ui/calendar/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/calendar/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/colorPicker/pom.xml =================================================================== --- branches/community/3.3.X/ui/colorPicker/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/colorPicker/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -12,7 +12,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/columns/pom.xml =================================================================== --- branches/community/3.3.X/ui/columns/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/columns/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/ui/combobox/pom.xml =================================================================== --- branches/community/3.3.X/ui/combobox/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/combobox/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> <name>combobox</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/componentControl/pom.xml =================================================================== --- branches/community/3.3.X/ui/componentControl/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/componentControl/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/contextMenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/contextMenu/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/contextMenu/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/core/pom.xml =================================================================== --- branches/community/3.3.X/ui/core/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/core/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/create.bat =================================================================== --- branches/community/3.3.X/ui/create.bat 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/create.bat 2010-04-16 10:31:58 UTC (rev 16766) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.4-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Modified: branches/community/3.3.X/ui/dataFilterSlider/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/dataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataTable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/dataTable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> --> </dependencies> Modified: branches/community/3.3.X/ui/datascroller/pom.xml =================================================================== --- branches/community/3.3.X/ui/datascroller/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/datascroller/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/drag-drop/pom.xml =================================================================== --- branches/community/3.3.X/ui/drag-drop/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/drag-drop/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> --> </dependencies> Modified: branches/community/3.3.X/ui/dropdown-menu/pom.xml =================================================================== --- branches/community/3.3.X/ui/dropdown-menu/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/dropdown-menu/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/editor/pom.xml =================================================================== --- branches/community/3.3.X/ui/editor/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/editor/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/effect/pom.xml =================================================================== --- branches/community/3.3.X/ui/effect/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/effect/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/extendedDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/extendedDataTable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/extendedDataTable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -64,40 +64,40 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/fileUpload/pom.xml =================================================================== --- branches/community/3.3.X/ui/fileUpload/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/fileUpload/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>fileUpload</artifactId> <name>fileUpload</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/functions/pom.xml =================================================================== --- branches/community/3.3.X/ui/functions/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/functions/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/gmap/pom.xml =================================================================== --- branches/community/3.3.X/ui/gmap/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/gmap/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/hotKey/pom.xml =================================================================== --- branches/community/3.3.X/ui/hotKey/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/hotKey/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/inplaceInput/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceInput/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/inplaceInput/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> <name>inplaceInput</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/inplaceSelect/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceSelect/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/inplaceSelect/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceSelect</artifactId> <name>inplaceSelect</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/inputnumber-slider/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/inputnumber-slider/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/inputnumber-spinner/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/insert/pom.xml =================================================================== --- branches/community/3.3.X/ui/insert/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/insert/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/jQuery/pom.xml =================================================================== --- branches/community/3.3.X/ui/jQuery/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/jQuery/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/layout/pom.xml =================================================================== --- branches/community/3.3.X/ui/layout/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/layout/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -4,18 +4,18 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>layout</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>layout</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/listShuttle/pom.xml =================================================================== --- branches/community/3.3.X/ui/listShuttle/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/listShuttle/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/community/3.3.X/ui/menu-components/pom.xml =================================================================== --- branches/community/3.3.X/ui/menu-components/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/menu-components/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/message/pom.xml =================================================================== --- branches/community/3.3.X/ui/message/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/message/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <name>Message</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/modal-panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/modal-panel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/modal-panel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/orderingList/pom.xml =================================================================== --- branches/community/3.3.X/ui/orderingList/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/orderingList/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/paint2D/pom.xml =================================================================== --- branches/community/3.3.X/ui/paint2D/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/paint2D/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/panel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/panel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/panelbar/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelbar/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/panelbar/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/panelmenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelmenu/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/panelmenu/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/pickList/pom.xml =================================================================== --- branches/community/3.3.X/ui/pickList/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/pickList/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>pickList</artifactId> <name>pickList</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -53,13 +53,13 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>listShuttle</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/community/3.3.X/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -187,12 +187,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -249,7 +249,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> Modified: branches/community/3.3.X/ui/progressBAR/pom.xml =================================================================== --- branches/community/3.3.X/ui/progressBAR/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/progressBAR/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> <name>progressBar</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/scrollableDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -70,12 +70,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/separator/pom.xml =================================================================== --- branches/community/3.3.X/ui/separator/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/separator/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/community/3.3.X/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/spacer/pom.xml =================================================================== --- branches/community/3.3.X/ui/spacer/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/spacer/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/state/pom.xml =================================================================== --- branches/community/3.3.X/ui/state/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/state/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/suggestionbox/pom.xml =================================================================== --- branches/community/3.3.X/ui/suggestionbox/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/suggestionbox/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/tabPanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/tabPanel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/tabPanel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/togglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/togglePanel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/togglePanel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/toolBar/pom.xml =================================================================== --- branches/community/3.3.X/ui/toolBar/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/toolBar/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/tooltip/pom.xml =================================================================== --- branches/community/3.3.X/ui/tooltip/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/tooltip/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/tree/pom.xml =================================================================== --- branches/community/3.3.X/ui/tree/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/tree/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/treeModel/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeModel/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/treeModel/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeTable/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/treeTable/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/community/3.3.X/ui/virtualEarth/pom.xml =================================================================== --- branches/community/3.3.X/ui/virtualEarth/pom.xml 2010-04-16 01:36:23 UTC (rev 16765) +++ branches/community/3.3.X/ui/virtualEarth/pom.xml 2010-04-16 10:31:58 UTC (rev 16766) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.4-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16765 - root/docs/trunk/Developer_Guide/en-US.

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

Author: SeanRogers Date: 2010-04-15 21:36:23 -0400 (Thu, 15 Apr 2010) New Revision: 16765 Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml Log: Fixed build error with filename Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml =================================================================== --- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml 2010-04-15 11:00:24 UTC (rev 16764) +++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-Skinning_and_theming.xml 2010-04-16 01:36:23 UTC (rev 16765) @@ -880,7 +880,7 @@ </step> <step> <title>Add the skin to the CDK</title> - <para>Change to the newly-created directory. Ensure it contains the <filename>pom.xml</name> project file, then enter the following command to create a new skin and add it to the <acronym>CDK</acronym> (Component Development Kit):</para> + <para>Change to the newly-created directory. Ensure it contains the <filename>pom.xml</filename> project file, then enter the following command to create a new skin and add it to the <acronym>CDK</acronym> (Component Development Kit):</para> <screen>mvn cdk:add-skin -Dname=<replaceable>SKIN-NAME</replaceable> -Dpackage=<replaceable>SKIN-PACKAGE</replaceable></screen> <para> Use the following keys for the command:

14 years, 1 month

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 April 2010