December 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r20809 - in trunk/ui: common/ui/src/main/java/org/richfaces/convert and 2 other directories.

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

Author: nbelaevski Date: 2010-12-27 08:37:38 -0500 (Mon, 27 Dec 2010) New Revision: 20809 Added: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java Removed: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelRecursiveAdaptor.java Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java trunk/ui/common/ui/src/main/java/org/richfaces/convert/ConverterUtil.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DeclarativeTreeDataModelWalker.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelAdaptor.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelRecursiveAdaptor.java trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelSequenceKeyConverter.java trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/IntegerSequenceRowKeyConverter.java trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/SequenceRowKeyConverter.java Log: https://issues.jboss.org/browse/RF-10047 https://issues.jboss.org/browse/RF-10038 https://issues.jboss.org/browse/RF-9995 Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -1298,7 +1298,7 @@ return dataVisitor.getVisitResult(); } else { - return visitComponents(dataChildren(), visitContext, callback); + return visitComponents(getFacetsAndChildren(), visitContext, callback); } } Modified: trunk/ui/common/ui/src/main/java/org/richfaces/convert/ConverterUtil.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/convert/ConverterUtil.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/common/ui/src/main/java/org/richfaces/convert/ConverterUtil.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -24,6 +24,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import javax.faces.convert.IntegerConverter; import com.google.common.base.Strings; @@ -33,8 +34,7 @@ */ public final class ConverterUtil { - private static final Converter STRING_CONVERTER = new Converter() { - + public static final class StringConverter implements Converter { public String getAsString(FacesContext context, UIComponent component, Object value) { if (value == null) { return ""; @@ -42,7 +42,7 @@ return value.toString(); } - + public Object getAsObject(FacesContext context, UIComponent component, String value) { if (Strings.isNullOrEmpty(value)) { return null; @@ -50,12 +50,20 @@ return value; } - }; + } + + private static final Converter STRING_CONVERTER = new StringConverter(); + private static final Converter INTEGER_CONVERTER = new IntegerConverter(); + private ConverterUtil() {} public static Converter stringConverter() { return STRING_CONVERTER; } + + public static Converter integerConverter() { + return INTEGER_CONVERTER; + } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -22,9 +22,11 @@ package org.richfaces.component; import java.io.IOException; +import java.text.MessageFormat; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; import javax.el.ELContext; import javax.el.ELException; @@ -38,6 +40,7 @@ import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; import javax.faces.event.AbortProcessingException; import javax.faces.event.ExceptionQueuedEvent; import javax.faces.event.ExceptionQueuedEventContext; @@ -65,6 +68,7 @@ import org.richfaces.event.TreeToggleEvent; import org.richfaces.event.TreeToggleListener; import org.richfaces.event.TreeToggleSource; +import org.richfaces.model.DeclarativeModelKey; import org.richfaces.model.DeclarativeTreeDataModelImpl; import org.richfaces.model.DeclarativeTreeModel; import org.richfaces.model.SwingTreeNodeDataModelImpl; @@ -77,6 +81,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; +import com.google.common.collect.Maps; /** * @author Nick Belaevski @@ -102,6 +107,10 @@ public static final String DEFAULT_TREE_NODE_FACET_NAME = DEFAULT_TREE_NODE_ID; + private static final String COMPONENT_FOR_MODEL_UNAVAILABLE = "Component is not available for model {0}"; + + private static final String CONVERTER_FOR_MODEL_UNAVAILABLE = "Row key converter is not available for model {0}"; + private static final class MatchingTreeNodePredicate implements Predicate<UIComponent> { private String type; @@ -141,6 +150,8 @@ private transient UIComponent currentComponent = this; + private transient Map<String, UIComponent> declatariveModelsMap = null; + public AbstractTree() { setKeepSaved(true); setRendererType("org.richfaces.TreeRenderer"); @@ -552,7 +563,9 @@ @Override protected void resetDataModel() { super.resetDataModel(); + treeRange = null; + declatariveModelsMap = null; } public TreeDataModelTuple createSnapshot() { @@ -570,4 +583,65 @@ super.restoreChildState(facesContext); } + protected UIComponent findDeclarativeModel(String modelId) { + if (declatariveModelsMap == null) { + declatariveModelsMap = Maps.newHashMap(); + } + + UIComponent adaptor = declatariveModelsMap.get(modelId); + if (adaptor == null) { + adaptor = findComponent(modelId); + if (adaptor != null) { + declatariveModelsMap.put(modelId, adaptor); + } + } + + if (adaptor == null) { + throw new IllegalStateException(MessageFormat.format(COMPONENT_FOR_MODEL_UNAVAILABLE, modelId)); + } + + return adaptor; + } + + public String convertDeclarativeKeyToString(FacesContext context, DeclarativeModelKey declarativeKey) throws ConverterException { + try { + UIComponent component = findDeclarativeModel(declarativeKey.getModelId()); + + TreeModelAdaptor adaptor = (TreeModelAdaptor) component; + + Converter rowKeyConverter = adaptor.getRowKeyConverter(); + if (rowKeyConverter == null) { + throw new ConverterException(MessageFormat.format(CONVERTER_FOR_MODEL_UNAVAILABLE, declarativeKey.getModelId())); + } + + return rowKeyConverter.getAsString(context, (UIComponent) adaptor, declarativeKey.getModelKey()); + } catch (ConverterException e) { + throw e; + } catch (Exception e) { + throw new ConverterException(e.getMessage(), e); + } + } + + public DeclarativeModelKey convertDeclarativeKeyFromString(FacesContext context, String modelId, + String modelKeyAsString) throws ConverterException { + + try { + UIComponent component = findDeclarativeModel(modelId); + + TreeModelAdaptor adaptor = (TreeModelAdaptor) component; + + Converter rowKeyConverter = adaptor.getRowKeyConverter(); + if (rowKeyConverter == null) { + throw new ConverterException(MessageFormat.format(CONVERTER_FOR_MODEL_UNAVAILABLE, modelId)); + } + + Object modelKey = rowKeyConverter.getAsObject(context, (UIComponent) adaptor, modelKeyAsString); + return new DeclarativeModelKey(modelId, modelKey); + } catch (ConverterException e) { + throw e; + } catch (Exception e) { + throw new ConverterException(e.getMessage(), e); + } + } + } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -21,19 +21,149 @@ */ package org.richfaces.component; +import java.util.Map; + +import javax.el.ValueExpression; +import javax.faces.component.PartialStateHolder; +import javax.faces.component.StateHelper; +import javax.faces.component.StateHolder; import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.Tag; +import org.richfaces.convert.ConverterUtil; /** * @author Nick Belaevski * */ -@JsfComponent(type = AbstractTreeModelAdaptor.COMPONENT_TYPE, - tag = @Tag(name = "treeModelAdaptor")) -public abstract class AbstractTreeModelAdaptor extends UIComponentBase implements TreeModelAdaptor { +public abstract class AbstractTreeModelAdaptor extends UIComponentBase { - public static final String COMPONENT_TYPE = "org.richfaces.TreeModelAdaptor"; + private enum PropertyKeys { + rowKeyConverter, rowKeyConverterSet + } + private Converter rowKeyConverter; + + public Converter getRowKeyConverter() { + if (this.rowKeyConverter != null) { + return this.rowKeyConverter; + } + + ValueExpression converterExpression = getValueExpression(PropertyKeys.rowKeyConverter.toString()); + if (converterExpression != null) { + return (Converter) converterExpression.getValue(getFacesContext().getELContext()); + } else { + return null; + } + } + + public void setRowKeyConverter(Converter converter) { + StateHelper stateHelper = getStateHelper(); + if (initialStateMarked()) { + stateHelper.put(PropertyKeys.rowKeyConverterSet, Boolean.TRUE); + } + + this.rowKeyConverter = converter; + } + + protected void memoizeDefaultRowKeyConverter(Object value) { + if (isSetRowKeyConverter()) { + return; + } + + if (value instanceof Iterable<?>) { + setRowKeyConverter(ConverterUtil.integerConverter()); + } else if (value instanceof Map<?, ?>) { + setRowKeyConverter(ConverterUtil.stringConverter()); + } + } + + private boolean isSetRowKeyConverter() { + return isSetLocalRowKeyConverter() || getValueExpression(PropertyKeys.rowKeyConverter.toString()) != null; + } + + private boolean isSetLocalRowKeyConverter() { + Boolean value = (Boolean) getStateHelper().get(PropertyKeys.rowKeyConverterSet); + return Boolean.TRUE.equals(value); + } + + @Override + public void markInitialState() { + super.markInitialState(); + + if (rowKeyConverter instanceof PartialStateHolder) { + ((PartialStateHolder) rowKeyConverter).markInitialState(); + } + } + + @Override + public void clearInitialState() { + super.clearInitialState(); + + if (rowKeyConverter instanceof PartialStateHolder) { + ((PartialStateHolder) rowKeyConverter).clearInitialState(); + } + } + + @Override + public void restoreState(FacesContext context, Object stateObject) { + Object[] state = (Object[]) stateObject; + + super.restoreState(context, state[0]); + + boolean converterHasPartialState = Boolean.TRUE.equals(state[1]); + Object savedConverterState = state[2]; + + if (converterHasPartialState) { + ((StateHolder) rowKeyConverter).restoreState(context, savedConverterState); + } else { + rowKeyConverter = (Converter) UIComponentBase.restoreAttachedState(context, savedConverterState); + } + } + + @Override + public Object saveState(FacesContext context) { + Object parentState = super.saveState(context); + + Object converterState = null; + boolean nullDelta = true; + + boolean converterHasPartialState = false; + + if (initialStateMarked()) { + if (!isSetLocalRowKeyConverter() && rowKeyConverter != null && rowKeyConverter instanceof PartialStateHolder) { + // Delta + StateHolder holder = (StateHolder) rowKeyConverter; + if (!holder.isTransient()) { + Object attachedState = holder.saveState(context); + if (attachedState != null) { + nullDelta = false; + converterState = attachedState; + } + converterHasPartialState = true; + } else { + converterState = null; + } + } else if (isSetLocalRowKeyConverter() || rowKeyConverter != null) { + // Full + converterState = saveAttachedState(context, rowKeyConverter); + nullDelta = false; + } + + if (parentState == null && nullDelta) { + // No values + return null; + } + } else { + converterState = saveAttachedState(context, rowKeyConverter); + } + + return new Object[] { + parentState, + converterHasPartialState, + converterState + }; + } + } Deleted: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelRecursiveAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelRecursiveAdaptor.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelRecursiveAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -1,43 +0,0 @@ -/* - * 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.component; - -import javax.faces.component.UIComponentBase; - -import org.richfaces.cdk.annotations.Attribute; -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.Tag; - -/** - * @author Nick Belaevski - * - */ -@JsfComponent(type = AbstractTreeModelRecursiveAdaptor.COMPONENT_TYPE, - tag = @Tag(name = "treeModelRecursiveAdaptor")) -public abstract class AbstractTreeModelRecursiveAdaptor extends UIComponentBase implements TreeModelRecursiveAdaptor { - - public static final String COMPONENT_TYPE = "org.richfaces.TreeModelRecursiveAdaptor"; - - @Attribute(defaultValue = "first") - public abstract String getRecursionOrder(); - -} Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DeclarativeTreeDataModelWalker.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DeclarativeTreeDataModelWalker.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/DeclarativeTreeDataModelWalker.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -66,7 +66,7 @@ } - private void setupChildModelContext(String modelId) { + private void setupModelComponentContext(String modelId) { if (currentComponent instanceof TreeModelRecursiveAdaptor && modelId.equals(currentComponent.getId())) { //currentComponent already set modelData = ((TreeModelRecursiveAdaptor) currentComponent).getNodes(); @@ -80,6 +80,15 @@ } } + private void setupDataModelContext(Object key) { + if (modelData instanceof Iterable<?>) { + Iterable<?> iterable = (Iterable<?>) modelData; + data = Iterables.get(iterable, (Integer) key); + } else { + data = ((Map<?, ?>) modelData).get(key); + } + } + protected FacesContext getFacesContext() { return facesContext; } @@ -104,7 +113,15 @@ } try { - walkSimpleKeys(key.getSimpleKeys()); + for (Object simpleKey : key.getSimpleKeys()) { + DeclarativeModelKey declarativeKey = (DeclarativeModelKey) simpleKey; + if (var != null) { + contextMap.put(var, data); + } + + setupModelComponentContext(declarativeKey.getModelId()); + setupDataModelContext(declarativeKey.getModelKey()); + } } finally { if (var != null) { try { @@ -116,35 +133,4 @@ } } - protected DeclarativeModelKey convertKey(Object nodes, DeclarativeModelKey declarativeModelKey) { - return declarativeModelKey; - } - - protected Object getData(Object nodes, Object key) { - if (nodes instanceof Iterable<?>) { - Iterable<?> iterable = (Iterable<?>) nodes; - return Iterables.get(iterable, (Integer) key); - } else { - return ((Map<?, ?>) nodes).get(key); - } - } - - protected void walkSimpleKey(DeclarativeModelKey segment) { - if (var != null) { - contextMap.put(var, data); - } - - setupChildModelContext(segment.getModelId()); - - DeclarativeModelKey convertedKey = convertKey(modelData, segment); - data = getData(modelData, convertedKey.getModelKey()); - } - - protected void walkSimpleKeys(Object[] simpleKeys) { - for (Object simpleKey : simpleKeys) { - DeclarativeModelKey declarativeKey = (DeclarativeModelKey) simpleKey; - walkSimpleKey(declarativeKey); - } - } - } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelAdaptor.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -21,12 +21,20 @@ */ package org.richfaces.component; +import javax.faces.convert.Converter; + +import org.richfaces.cdk.annotations.Attribute; + /** * @author Nick Belaevski * */ public interface TreeModelAdaptor { + @Attribute public Object getNodes(); + @Attribute + public Converter getRowKeyConverter(); + } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelRecursiveAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelRecursiveAdaptor.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/TreeModelRecursiveAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -21,12 +21,15 @@ */ package org.richfaces.component; +import org.richfaces.cdk.annotations.Attribute; + /** * @author Nick Belaevski * */ public interface TreeModelRecursiveAdaptor extends TreeModelAdaptor { + @Attribute public Object getRoots(); public String getRecursionOrder(); Added: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java (rev 0) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -0,0 +1,61 @@ +/* + * 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.component; + +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; + +/** + * @author Nick Belaevski + * + */ +@JsfComponent(type = UITreeModelAdaptor.COMPONENT_TYPE, + family = UITreeModelAdaptor.COMPONENT_FAMILY, + tag = @Tag(name = "treeModelAdaptor")) +public class UITreeModelAdaptor extends AbstractTreeModelAdaptor implements TreeModelAdaptor { + + public static final String COMPONENT_TYPE = "org.richfaces.TreeModelAdaptor"; + + public static final String COMPONENT_FAMILY = "org.richfaces.TreeModelAdaptor"; + + private enum PropertyKeys { + nodes + } + + @Override + public String getFamily() { + return COMPONENT_FAMILY; + } + + public Object getNodes() { + Object nodes = getStateHelper().eval(PropertyKeys.nodes); + + memoizeDefaultRowKeyConverter(nodes); + + return nodes; + } + + public void setNodes(Object nodes) { + getStateHelper().put(PropertyKeys.nodes, nodes); + } + +} Added: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java (rev 0) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -0,0 +1,73 @@ +/* + * 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.component; + +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.Tag; + +/** + * @author Nick Belaevski + * + */ +@JsfComponent(type = UITreeModelRecursiveAdaptor.COMPONENT_TYPE, + family = UITreeModelRecursiveAdaptor.COMPONENT_FAMILY, + tag = @Tag(name = "treeModelRecursiveAdaptor")) +public class UITreeModelRecursiveAdaptor extends AbstractTreeModelAdaptor implements TreeModelRecursiveAdaptor { + + public static final String COMPONENT_TYPE = "org.richfaces.TreeModelRecursiveAdaptor"; + + public static final String COMPONENT_FAMILY = "org.richfaces.TreeModelRecursiveAdaptor"; + + private enum PropertyKeys { + roots, nodes + } + + @Override + public String getFamily() { + return COMPONENT_FAMILY; + } + + public Object getRoots() { + Object roots = getStateHelper().eval(PropertyKeys.roots); + + memoizeDefaultRowKeyConverter(roots); + + return roots; + } + + public void setRoots(Object roots) { + getStateHelper().put(PropertyKeys.roots, roots); + } + + public Object getNodes() { + return getStateHelper().eval(PropertyKeys.nodes); + } + + public void setNodes(Object nodes) { + getStateHelper().put(PropertyKeys.nodes, nodes); + } + + public String getRecursionOrder() { + return null; + } + +} Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelSequenceKeyConverter.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelSequenceKeyConverter.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelSequenceKeyConverter.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -21,85 +21,85 @@ */ package org.richfaces.convert; +import static org.richfaces.convert.SequenceRowKeyConverter.SEPARATOR_SPLITTER; +import static org.richfaces.convert.TreeConverterUtil.escape; +import static org.richfaces.convert.TreeConverterUtil.unescape; +import static org.richfaces.model.TreeDataModel.SEPARATOR_CHAR; + +import java.util.Iterator; +import java.util.List; + import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; -import javax.faces.convert.IntegerConverter; import org.richfaces.component.AbstractTree; -import org.richfaces.component.DeclarativeTreeDataModelWalker; import org.richfaces.model.DeclarativeModelKey; import org.richfaces.model.SequenceRowKey; + +import com.google.common.base.Strings; +import com.google.common.collect.Lists; /** * @author Nick Belaevski * */ -public class DeclarativeModelSequenceKeyConverter extends SequenceRowKeyConverter<DeclarativeModelKey> { +public class DeclarativeModelSequenceKeyConverter implements Converter { - private final class KeyConvertingWalker extends DeclarativeTreeDataModelWalker { + public static final String CONVERTER_ID = "org.richfaces.DeclarativeModelSequenceKeyConverter"; + + public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException { + if (Strings.isNullOrEmpty(value)) { + return null; + } + + Iterator<String> split = SEPARATOR_SPLITTER.split(value).iterator(); - private final FacesContext context; - - private DeclarativeModelKey[] convertedSimpleKeys; - - private int keysIdx; + AbstractTree tree = (AbstractTree) component; - private KeyConvertingWalker(FacesContext context, AbstractTree rootComponent) { - super(context, rootComponent); - this.context = context; - } - - @Override - protected DeclarativeModelKey convertKey(Object nodes, DeclarativeModelKey declarativeModelKey) { - DeclarativeModelKey convertedKey; + List<DeclarativeModelKey> declarativeKeys = Lists.newArrayList(); + + while (split.hasNext()) { + String modelId = unescape(split.next()); + String modelKeyAsString = unescape(split.next()); - if (nodes instanceof Iterable<?>) { - String modelKeyAsString = (String) declarativeModelKey.getModelKey(); - Object modelKey = INTEGER_CONVERTER.getAsObject(context, getRootComponent(), modelKeyAsString); - convertedKey = new DeclarativeModelKey(declarativeModelKey.getModelId(), modelKey); - } else { - convertedKey = declarativeModelKey; - } - - convertedSimpleKeys[keysIdx++] = convertedKey; + DeclarativeModelKey declarativeKey = tree.convertDeclarativeKeyFromString(context, modelId, modelKeyAsString); - return super.convertKey(nodes, convertedKey); + declarativeKeys.add(declarativeKey); } - @Override - public void walk(SequenceRowKey key) { - convertedSimpleKeys = new DeclarativeModelKey[key.getSimpleKeys().length]; - keysIdx = 0; - super.walk(key); - } + return new SequenceRowKey((Object[]) declarativeKeys.toArray(new DeclarativeModelKey[declarativeKeys.size()])); + } - public DeclarativeModelKey[] getConvertedSimpleKeys() { - return convertedSimpleKeys; + public String getAsString(FacesContext context, UIComponent component, Object value) { + if (value == null) { + return ""; } - } - - public static final String CONVERTER_ID = "org.richfaces.DeclarativeModelSequenceKeyConverter"; - - private static final Converter INTEGER_CONVERTER = new IntegerConverter(); - - public DeclarativeModelSequenceKeyConverter() { - super(DeclarativeModelKey.class, new DeclarativeModelKeyConverter(ConverterUtil.stringConverter())); - } - - @Override - public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException { - SequenceRowKey key = (SequenceRowKey) super.getAsObject(context, component, value); - if (key != null) { + SequenceRowKey sequenceRowKey = (SequenceRowKey) value; + + Object[] declarativeKeys = sequenceRowKey.getSimpleKeys(); + AbstractTree tree = (AbstractTree) component; + + StringBuilder result = new StringBuilder(); + + for (Object declarativeKeyObject : declarativeKeys) { + DeclarativeModelKey declarativeKey = (DeclarativeModelKey) declarativeKeyObject; + String modelId = escape(declarativeKey.getModelId()); - KeyConvertingWalker walker = new KeyConvertingWalker(context, (AbstractTree) component); - walker.walk(key); + String modelKeyAsString = escape(tree.convertDeclarativeKeyToString(context, declarativeKey)); - key = new SequenceRowKey((Object[]) walker.getConvertedSimpleKeys()); + if (result.length() != 0) { + result.append(SEPARATOR_CHAR); + } + + result.append(modelId); + + result.append(SEPARATOR_CHAR); + result.append(modelKeyAsString); } - return key; + return result.toString(); } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/IntegerSequenceRowKeyConverter.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/IntegerSequenceRowKeyConverter.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/IntegerSequenceRowKeyConverter.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -21,7 +21,6 @@ */ package org.richfaces.convert; -import javax.faces.convert.IntegerConverter; /** * @author Nick Belaevski @@ -32,7 +31,7 @@ public static final String CONVERTER_ID = "org.richfaces.IntegerSequenceRowKeyConverter"; public IntegerSequenceRowKeyConverter() { - super(Integer.class, new IntegerConverter()); + super(Integer.class, ConverterUtil.integerConverter()); } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/SequenceRowKeyConverter.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/SequenceRowKeyConverter.java 2010-12-27 13:36:30 UTC (rev 20808) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/SequenceRowKeyConverter.java 2010-12-27 13:37:38 UTC (rev 20809) @@ -1,12 +1,14 @@ package org.richfaces.convert; +import static org.richfaces.model.TreeDataModel.SEPARATOR_CHAR; + import java.util.List; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; -import static org.richfaces.model.TreeDataModel.*; + import org.richfaces.model.SequenceRowKey; import com.google.common.base.Splitter; @@ -21,7 +23,7 @@ public class SequenceRowKeyConverter<T> implements Converter { - private static final Splitter DOT_SPLITTER = Splitter.on(SEPARATOR_CHAR); + static final Splitter SEPARATOR_SPLITTER = Splitter.on(SEPARATOR_CHAR); private Class<T> clazz; @@ -38,7 +40,7 @@ return null; } - Iterable<String> split = DOT_SPLITTER.split(value); + Iterable<String> split = SEPARATOR_SPLITTER.split(value); List<T> keysList = Lists.<T>newArrayList(); for (String s: split) {

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20808 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: abelevich Date: 2010-12-27 08:36:30 -0500 (Mon, 27 Dec 2010) New Revision: 20808 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js Log: https://jira.jboss.org/browse/RF-9734 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-12-27 12:48:01 UTC (rev 20807) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-12-27 13:36:30 UTC (rev 20808) @@ -366,16 +366,18 @@ this.setValue(label); this.hidePopup(); this.__setInputFocus(); - - this.invokeEvent.call(this,"selectitem", document.getElementById(this.id + 'Input')); + this.__save(); + + if(this.focusValue != this.selValueInput.val() ) { + this.invokeEvent.call(this,"selectitem", document.getElementById(this.id + 'Input')); + } }, - onblur: function(e) { - this.hidePopup(); + __save: function() { var value = ""; - var label = this.defaultLabel; - var clientItem; + var label = ""; var inputLabel = this.getValue(); + if(inputLabel && inputLabel != "") { if(this.enableManualInput) { clientItem = this.__getClientItemFromCache(inputLabel); @@ -387,10 +389,21 @@ label = clientItem.label; value = clientItem.value; } - } - + } + this.setValue(label); this.selValueInput.val(value); + }, + + onblur: function(e) { + this.hidePopup(); + var inputLabel = this.getValue(); + + if(!inputLabel || inputLabel == "") { + this.setValue(this.defaultLabel); + this.selValueInput.val(""); + } + this.focused = false; this.invokeEvent.call(this,"blur", document.getElementById(this.id + 'Input'), e); if(this.focusValue != this.selValueInput.val() ) {

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20807 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.

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

Author: amarkhel Date: 2010-12-27 07:48:01 -0500 (Mon, 27 Dec 2010) New Revision: 20807 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss Log: https://issues.jboss.org/browse/RF-9653 popupPanel: trimOverlayedElements not working Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-12-27 12:32:01 UTC (rev 20806) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-12-27 12:48:01 UTC (rev 20807) @@ -164,7 +164,7 @@ public String getStyleIfTrimmed(UIComponent panel){ if (panel.getAttributes().get("trimOverlayedElements").equals(Boolean.TRUE)) { - return "position: relative, z-index : 0"; + return "position: relative; z-index : 0;"; } return ""; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-12-27 12:32:01 UTC (rev 20806) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-12-27 12:48:01 UTC (rev 20807) @@ -65,8 +65,7 @@ z-index:100; } -.rf-pp-cnt-scrlr { - position : relative; +.rf-pp-cnt-scrlr { top : 0px; left : 0px; overflow : auto;

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20806 - in trunk/ui/output/ui/src/main: resources/META-INF and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2010-12-27 07:32:01 -0500 (Mon, 27 Dec 2010) New Revision: 20806 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml Log: move TooltipDirection to commons-ui Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-27 10:21:43 UTC (rev 20805) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-27 12:32:01 UTC (rev 20806) @@ -30,7 +30,6 @@ import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; -import org.richfaces.TooltipDirection; import org.richfaces.TooltipLayout; import org.richfaces.TooltipMode; import org.richfaces.context.ExtendedVisitContext; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-27 10:21:43 UTC (rev 20805) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-27 12:32:01 UTC (rev 20806) @@ -24,7 +24,6 @@ package org.richfaces.component; import org.richfaces.TooltipLayout; -import org.richfaces.TooltipDirection; import org.richfaces.TooltipMode; /** Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-27 10:21:43 UTC (rev 20805) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-27 12:32:01 UTC (rev 20806) @@ -855,7 +855,7 @@ <property> <description></description> <property-name>direction</property-name> - <property-class>org.richfaces.TooltipDirection</property-class> + <property-class>org.richfaces.component.TooltipDirection</property-class> </property> <property> <description></description> Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-27 10:21:43 UTC (rev 20805) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-27 12:32:01 UTC (rev 20806) @@ -909,7 +909,7 @@ </attribute> <attribute> <name>direction</name> - <type>org.richfaces.TooltipDirection</type> + <type>org.richfaces.component.TooltipDirection</type> </attribute> <attribute> <name>disabled</name>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20805 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: amarkhel Date: 2010-12-27 05:21:43 -0500 (Mon, 27 Dec 2010) New Revision: 20805 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss Log: https://issues.jboss.org/browse/RF-9653 popupPanel: trimOverlayedElements not working Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-12-27 10:13:24 UTC (rev 20804) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-12-27 10:21:43 UTC (rev 20805) @@ -71,8 +71,7 @@ left : 0px; overflow : auto; } -.rf-pp-cnt { - position : relative; +.rf-pp-cnt { padding : 10px; color : '#{richSkin.generalTextColor}'; font-family : '#{richSkin.generalFamilyFont}';

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20804 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu.

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

Author: ilya_shaikovsky Date: 2010-12-27 05:13:24 -0500 (Mon, 27 Dec 2010) New Revision: 20804 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java Log: sysout removed Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java 2010-12-27 10:00:18 UTC (rev 20803) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/panelmenu/PanelMenuBean.java 2010-12-27 10:13:24 UTC (rev 20804) @@ -29,6 +29,5 @@ public void updateCurrent(ItemChangeEvent event) { setCurrent(event.getNewItem()); - System.out.println(event.getNewItem()); } }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20803 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/model/slides.

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

Author: ilya_shaikovsky Date: 2010-12-27 05:00:18 -0500 (Mon, 27 Dec 2010) New Revision: 20803 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/model/slides/Picture.java Log: https://issues.jboss.org/browse/RF-10068 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/model/slides/Picture.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/model/slides/Picture.java 2010-12-27 09:31:58 UTC (rev 20802) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/model/slides/Picture.java 2010-12-27 10:00:18 UTC (rev 20803) @@ -1,6 +1,8 @@ package org.richfaces.demo.tables.model.slides; -public class Picture { +import java.io.Serializable; + +public class Picture implements Serializable{ private String name; private String uri;

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20802 - in trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop: samples and 1 other directory.

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

Author: ilya_shaikovsky Date: 2010-12-27 04:31:58 -0500 (Mon, 27 Dec 2010) New Revision: 20802 Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/dragDrop.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/samples/dragDrop-sample.xhtml Log: https://issues.jboss.org/browse/RF-10074 Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/dragDrop.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/dragDrop.xhtml 2010-12-26 23:24:08 UTC (rev 20801) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/dragDrop.xhtml 2010-12-27 09:31:58 UTC (rev 20802) @@ -5,6 +5,39 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> + The Richfaces Drag-n-Drop component suite includes three + components: dragSource, dropTarget and dragIndicator. + + rich:dragSource is used to point to the JSF component + that becomes draggable. If you want to add a draggable feature to the + existing component, attach dragSupport as a child component to it. + + rich:dropSupport is similar to the dragSupport, but it's + used to define the drog zone. dropSupport has a built-in Ajax support. + I.e. it allows to send an Ajax request and re-render the specified area + on a page when the Ajax response is returned back. With the dropListener + attribute you can point to a method of the backing bean that accepts + DropEvent as a parameter. This event contains information provided by + dropValue and dragValue attributes of dropSupport and + dragSupport. + + rich:dragIndicator is a special visual representation of + a dragged object. By default it creates a copy of dragged elements. But + the markup could be redefined(not implemented in first release). + + Note: The parent component for dragSupport and dropSupport + should be designed to render its children and has two attribute + "onmouseover" and "onmouseout". You can use <a4j:outputPanel> as + a container if the component is not satisfy this requirements. Use + <a4j:outputPanel> layout="block" to wrap the component with a + block type layout. + + The following example demonstrates the drag-n-drop functionality + on practice. The left list contains the examples of Ajax frameworks. Do + you know them? The demo helps you to sort them out. Drag one and drag + over the headers of three panels. If the draggable framework is + suitable for a certain framework family, it will be accepted and moved + from source panel to the target list. <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -12,5 +45,11 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + That demo shows most important feature of the RichFaces drag and + drop mechanism. You could mark several different components as + 'draggable' and define different drag type's for them via + attribute. Then you could add corresponding drop zones and use acceptType's + attributes to define which drop zone will process corresponding dragged + elements. </ui:composition> </html> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/samples/dragDrop-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/samples/dragDrop-sample.xhtml 2010-12-26 23:24:08 UTC (rev 20801) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dragDrop/samples/dragDrop-sample.xhtml 2010-12-27 09:31:58 UTC (rev 20802) @@ -7,24 +7,17 @@ xmlns:rich="http://richfaces.org/rich"> <h:outputStylesheet> - .panelc { - width:25%; - vertical-align:top; - } - - .dropTargetPanel { - width: 90%; - } - + .panelc { width:25%; } + .valign { vertical-align:top; } + .dropTargetPanel { width: 90%; } .footerClass { text-align: center; padding-top: 5px; } </h:outputStylesheet> - <h:form id="form"> - <h:panelGrid columnClasses="panelc" columns="4" width="100%"> + <h:panelGrid columnClasses="panelc valign, valign, valign, valign" columns="4" width="100%"> <rich:panel style="width:133px"> <f:facet name="header"> @@ -37,14 +30,14 @@ <a4j:outputPanel style="width:100px;border:1px solid gray;padding:2px" layout="block"> - <rich:dragBehavior event="mouseover" - type="#{fm.family}" dragValue="#{fm}" /> + <rich:dragSource type="#{fm.family}" + dragValue="#{fm}" /> <h:outputText value="#{fm.name}"></h:outputText> </a4j:outputPanel> </h:column> <f:facet name="footer"> - <a4j:commandButton action="#{dragDropBean.reset}" value="Start Over" - render="src,phptable,cftable,dnettable" /> + <a4j:commandButton action="#{dragDropBean.reset}" + value="Start Over" render="src,phptable,cftable,dnettable" /> </f:facet> </h:dataTable> </rich:panel> @@ -53,8 +46,9 @@ <f:facet name="header"> <h:outputText value="PHP Frameworks" /> </f:facet> - <rich:dropBehavior event="mouseover" acceptedTypes="php" dropValue="PHP" - listener="#{dragDropEventBean.processDrop}" render="phptable, src" /> + <rich:dropTarget acceptedTypes="php" dropValue="PHP" + dropListener="#{dragDropEventBean.processDrop}" + render="phptable, src" /> <h:dataTable id="phptable" columns="1" value="#{dragDropBean.targetPHP}" var="fm"> @@ -70,8 +64,9 @@ <f:facet name="header"> <h:outputText value=".NET Frameworks" /> </f:facet> - <rich:dropBehavior event="mouseover" acceptedTypes="dotNet" dropValue="DNET" - listener="#{dragDropEventBean.processDrop}" render="dnettable, src" /> + <rich:dropTarget acceptedTypes="dotNet" dropValue="DNET" + dropListener="#{dragDropEventBean.processDrop}" + render="dnettable, src" /> <h:dataTable id="dnettable" columns="1" value="#{dragDropBean.targetDotNet}" var="fm"> @@ -87,11 +82,12 @@ <f:facet name="header"> <h:outputText value="ColdFusion Frameworks" /> </f:facet> - <rich:dropBehavior event="mouseover" acceptedTypes="cf" dropValue="CF" - listener="#{dragDropEventBean.processDrop}" render="cftable, src" /> + <rich:dropTarget acceptedTypes="cf" dropValue="CF" + dropListener="#{dragDropEventBean.processDrop}" + render="cftable, src" /> - <h:dataTable id="cftable" columns="1" value="#{dragDropBean.targetCF}" - var="fm"> + <h:dataTable id="cftable" columns="1" + value="#{dragDropBean.targetCF}" var="fm"> <h:column> <h:outputText value="#{fm.name}"></h:outputText> </h:column>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20801 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

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

Author: amarkhel Date: 2010-12-26 18:24:08 -0500 (Sun, 26 Dec 2010) New Revision: 20801 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js Log: https://issues.jboss.org/browse/RF-9966 Dropdown menu component: close open menu when select another one Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-26 17:21:38 UTC (rev 20800) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/menu.js 2010-12-26 23:24:08 UTC (rev 20801) @@ -47,6 +47,9 @@ this), this); rf.Event.bindById(this.id, "mouseleave", $.proxy(this.__leaveHandler, this), this); + if (!rf.ui.MenuManager) + rf.ui.MenuManager = {}; + this.menuManager=rf.ui.MenuManager; }; @@ -96,7 +99,7 @@ && !this.__isGroup(item)) { this.invokeEvent("itemclick", rf.getDomElement(this.id), null); - this.hidePopup(); + this.hide(); } }, @@ -119,8 +122,19 @@ // } }, + + show: function() { + this.menuManager.shutdownMenu(); + this.__showPopup(); + this.menuManager.addMenuId(this.id); + }, + + hide: function() { + this.menuManager.deletedMenuId(); + this.__hidePopup(); + }, - showPopup : function() { + __showPopup : function() { if (!this.__isShown()) { this.invokeEvent("show", rf.getDomElement(this.id), null); this.popupList.show(); @@ -128,7 +142,7 @@ } }, - hidePopup : function() { + __hidePopup : function() { /* * for (var i in this.groupList) { this.groupList[i].hide(); } */ @@ -155,7 +169,7 @@ ___showHandler : function() { this.showTimeoutId = window.setTimeout($.proxy(function() { - this.showPopup(); + this.show(); }, this), this.options.showDelay); }, @@ -166,7 +180,7 @@ __leaveHandler : function(e) { window.clearTimeout(this.showTimeoutId); this.hideTimeoutId = window.setTimeout($.proxy(function() { - this.hidePopup(); + this.hide(); }, this), this.options.hideDelay); }, @@ -183,4 +197,25 @@ } }; })()); + + rf.ui.MenuManager = { + openedMenu: null, + + addMenuId: function(menuId) { + this.openedMenu = menuId; + + }, + + deletedMenuId: function () { + this.openedMenu = null; + }, + + shutdownMenu: function () { + if (this.openedMenu != null){ + rf.$(rf.getDomElement(this.openedMenu)).hide(); + } + this.deletedMenuId(); + } + + } })(jQuery, RichFaces) \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20800 - in branches/4.0.0.M5: archetypes and 63 other directories.

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

Author: nbelaevski Date: 2010-12-26 12:21:38 -0500 (Sun, 26 Dec 2010) New Revision: 20800 Modified: branches/4.0.0.M5/archetypes/pom.xml branches/4.0.0.M5/archetypes/rf-gae-sample/pom.xml branches/4.0.0.M5/archetypes/richfaces-archetype-simpleapp/pom.xml branches/4.0.0.M5/archetypes/richfaces-component-short/pom.xml branches/4.0.0.M5/archetypes/richfaces-component/pom.xml branches/4.0.0.M5/archetypes/richfaces-components-aggregator/pom.xml branches/4.0.0.M5/bom/pom.xml branches/4.0.0.M5/cdk/annotations/pom.xml branches/4.0.0.M5/cdk/attributes/pom.xml branches/4.0.0.M5/cdk/commons/pom.xml branches/4.0.0.M5/cdk/dist/pom.xml branches/4.0.0.M5/cdk/generator/pom.xml branches/4.0.0.M5/cdk/maven-cdk-plugin/pom.xml branches/4.0.0.M5/cdk/maven-resources-plugin/pom.xml branches/4.0.0.M5/cdk/parent/pom.xml branches/4.0.0.M5/cdk/pom.xml branches/4.0.0.M5/cdk/xinclude/pom.xml branches/4.0.0.M5/core/api/pom.xml branches/4.0.0.M5/core/impl/pom.xml branches/4.0.0.M5/core/parent/pom.xml branches/4.0.0.M5/core/pom.xml branches/4.0.0.M5/dist/pom.xml branches/4.0.0.M5/examples/core-demo/pom.xml branches/4.0.0.M5/examples/dnd-demo/pom.xml branches/4.0.0.M5/examples/input-demo/pom.xml branches/4.0.0.M5/examples/iteration-demo/pom.xml branches/4.0.0.M5/examples/misc-demo/pom.xml branches/4.0.0.M5/examples/output-demo/pom.xml branches/4.0.0.M5/examples/parent/pom.xml branches/4.0.0.M5/examples/pom.xml branches/4.0.0.M5/examples/push-demo/pom.xml branches/4.0.0.M5/examples/repeater-demo/pom.xml branches/4.0.0.M5/examples/richfaces-showcase/pom.xml branches/4.0.0.M5/examples/template/pom.xml branches/4.0.0.M5/examples/validator-demo/pom.xml branches/4.0.0.M5/parent/pom.xml branches/4.0.0.M5/pom.xml branches/4.0.0.M5/ui/common/api/pom.xml branches/4.0.0.M5/ui/common/pom.xml branches/4.0.0.M5/ui/common/ui/pom.xml branches/4.0.0.M5/ui/core/api/pom.xml branches/4.0.0.M5/ui/core/pom.xml branches/4.0.0.M5/ui/core/ui/pom.xml branches/4.0.0.M5/ui/dist/pom.xml branches/4.0.0.M5/ui/dist/richfaces-components-api/pom.xml branches/4.0.0.M5/ui/dist/richfaces-components-ui/pom.xml branches/4.0.0.M5/ui/dnd/api/pom.xml branches/4.0.0.M5/ui/dnd/pom.xml branches/4.0.0.M5/ui/dnd/ui/pom.xml branches/4.0.0.M5/ui/input/api/pom.xml branches/4.0.0.M5/ui/input/pom.xml branches/4.0.0.M5/ui/input/ui/pom.xml branches/4.0.0.M5/ui/iteration/api/pom.xml branches/4.0.0.M5/ui/iteration/pom.xml branches/4.0.0.M5/ui/iteration/ui/pom.xml branches/4.0.0.M5/ui/misc/pom.xml branches/4.0.0.M5/ui/misc/ui/pom.xml branches/4.0.0.M5/ui/output/api/pom.xml branches/4.0.0.M5/ui/output/pom.xml branches/4.0.0.M5/ui/output/ui/pom.xml branches/4.0.0.M5/ui/parent/pom.xml branches/4.0.0.M5/ui/pom.xml branches/4.0.0.M5/ui/validator/api/pom.xml branches/4.0.0.M5/ui/validator/pom.xml branches/4.0.0.M5/ui/validator/ui/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: branches/4.0.0.M5/archetypes/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -30,7 +30,7 @@ <groupId>org.richfaces.archetypes</groupId> <artifactId>archetypes-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces Archetypes: Aggregator</name> @@ -49,9 +49,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetypes</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetypes</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes</url> </scm> </project> Modified: branches/4.0.0.M5/archetypes/rf-gae-sample/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/rf-gae-sample/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/rf-gae-sample/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-archetype-gae</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>RichFaces Archetypes: GAE Application</name> @@ -93,9 +93,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetyp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetype...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes/ri...</url> </scm> </project> Modified: branches/4.0.0.M5/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -11,7 +11,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-archetype-simpleapp</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>RichFaces Archetypes: Simple Application</name> @@ -92,9 +92,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetyp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetype...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes/ri...</url> </scm> </project> Modified: branches/4.0.0.M5/archetypes/richfaces-component/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/richfaces-component/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/richfaces-component/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-component</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>RichFaces Archetypes: Component</name> @@ -96,9 +96,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetyp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetype...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes/ri...</url> </scm> </project> Modified: branches/4.0.0.M5/archetypes/richfaces-component-short/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/richfaces-component-short/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/richfaces-component-short/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-component-short</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>RichFaces Archetypes: Component Short</name> @@ -96,9 +96,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetyp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetype...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes/ri...</url> </scm> </project> Modified: branches/4.0.0.M5/archetypes/richfaces-components-aggregator/pom.xml =================================================================== --- branches/4.0.0.M5/archetypes/richfaces-components-aggregator/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/archetypes/richfaces-components-aggregator/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.archetypes</groupId> <artifactId>richfaces-components-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>RichFaces Archetypes: Components Aggregator</name> @@ -96,9 +96,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/a...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/arch...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/archetyp...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/archet...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/archetype...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/archetypes/ri...</url> </scm> </project> Modified: branches/4.0.0.M5/bom/pom.xml =================================================================== --- branches/4.0.0.M5/bom/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/bom/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -18,7 +18,7 @@ <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> <packaging>pom</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces BOM</name> <parent> @@ -227,9 +227,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/b...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/buil...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/build/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/build/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/build/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/build/bom</url> </scm> </project> Modified: branches/4.0.0.M5/cdk/annotations/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/annotations/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/annotations/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,12 +4,12 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <description>That project contains annotations for JSF classes</description> <name>annotations</name> <dependencies> Modified: branches/4.0.0.M5/cdk/attributes/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/attributes/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/attributes/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,12 +4,12 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>attributes</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <description>That project contains JAXB bindings for model classes representing schema attributes data</description> <name>attributes</name> Modified: branches/4.0.0.M5/cdk/commons/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/commons/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/commons/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,12 +4,12 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>commons</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>commons</name> <build> <plugins> Modified: branches/4.0.0.M5/cdk/dist/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/dist/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/dist/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,20 +4,20 @@ <parent> <groupId>org.richfaces.cdk</groupId> <artifactId>parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>dist</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>JSF Components Development Kit (CDK) distribution assembly</name>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/c...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/cdk/...</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/tags/4.0.0.20101226-M5/cdk/...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk/dist</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/branches/4.0.0.M5/cdk/dist</url> </scm> <build> <finalName>cdk</finalName> Modified: branches/4.0.0.M5/cdk/generator/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/generator/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/generator/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -3,13 +3,13 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Java Server Faces component generator</name> Modified: branches/4.0.0.M5/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/maven-cdk-plugin/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/maven-cdk-plugin/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -2,13 +2,13 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> Modified: branches/4.0.0.M5/cdk/maven-resources-plugin/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/maven-resources-plugin/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/maven-resources-plugin/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,13 +4,13 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>maven-resources-plugin</name> <description>Maven plugin for packaging resources with web application</description> Modified: branches/4.0.0.M5/cdk/parent/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/parent/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/parent/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -5,7 +5,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -13,7 +13,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development Kit (CDK)</name> @@ -22,9 +22,9 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/c...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/cdk/...</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent/tags/4.0.0.20101226-...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk/pa...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/parent/branches/4.0.0.M5/cd...</url> </scm> <build> Modified: branches/4.0.0.M5/cdk/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -11,7 +11,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JSF Components Development Kit (CDK)</name> <properties> @@ -32,9 +32,9 @@ </modules>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/cdk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/cdk</developerConnection> - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/tags/4.0.0.20101226-M5/cdk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/cdk</developerConnection> + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/branches/4.0.0.M5/cdk</url> </scm>  Modified: branches/4.0.0.M5/cdk/xinclude/pom.xml =================================================================== --- branches/4.0.0.M5/cdk/xinclude/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/cdk/xinclude/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -22,13 +22,13 @@ <parent> <artifactId>parent</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>xinclude</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Cocoon 3: xinclude transformer</name> <description>Cocoon 3 xinclude transformer with Xpointer scheme support.</description> Modified: branches/4.0.0.M5/core/api/pom.xml =================================================================== --- branches/4.0.0.M5/core/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/core/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -22,7 +22,7 @@ <parent> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -80,8 +80,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/c...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/core...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/core/api</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/api</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/api</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/core/api</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/core/impl/pom.xml =================================================================== --- branches/4.0.0.M5/core/impl/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/core/impl/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -20,7 +20,7 @@ <parent> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -237,8 +237,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/c...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/core...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/core/impl</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/impl</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/impl</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/core/impl</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/core/parent/pom.xml =================================================================== --- branches/4.0.0.M5/core/parent/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/core/parent/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -23,13 +23,13 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <packaging>pom</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Core Parent</name> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -46,8 +46,8 @@ </dependencyManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/c...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/core...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/core/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/p...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/core/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/core/parent</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/core/pom.xml =================================================================== --- branches/4.0.0.M5/core/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/core/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -29,7 +29,7 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces Core Aggregator</name> @@ -43,9 +43,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/core</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/core</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/core</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/core</url> </scm> </project> Modified: branches/4.0.0.M5/dist/pom.xml =================================================================== --- branches/4.0.0.M5/dist/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/dist/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,13 +24,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-distribution</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces Distribution Assembler</name> @@ -187,8 +187,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/dist</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/dist</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/dist</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/dist</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/dist</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/examples/core-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/core-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/core-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,14 +24,14 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>core-demo</artifactId> <packaging>war</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Examples: Core</name> <properties> @@ -193,8 +193,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/e...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/exam...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/examples...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/exampl...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/examples/...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/examples/core...</url> </scm> </project> Modified: branches/4.0.0.M5/examples/dnd-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/dnd-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/dnd-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -12,7 +12,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>dnd-demo</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Examples: DND</name> <packaging>war</packaging> Modified: branches/4.0.0.M5/examples/input-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/input-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/input-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -12,7 +12,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>input-demo</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Examples: Inputs</name> <packaging>war</packaging> Modified: branches/4.0.0.M5/examples/iteration-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/iteration-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/iteration-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,14 +24,14 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>iteration-demo</artifactId> <packaging>war</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Examples: Iteration</name> <properties> Modified: branches/4.0.0.M5/examples/misc-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/misc-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/misc-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,13 +24,13 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>misc-demo</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>RichFaces Examples: Miscellanous</name> Modified: branches/4.0.0.M5/examples/output-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/output-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/output-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -12,7 +12,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>output-demo</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Examples: Outputs</name> <packaging>war</packaging> Modified: branches/4.0.0.M5/examples/parent/pom.xml =================================================================== --- branches/4.0.0.M5/examples/parent/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/parent/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -29,7 +29,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces Examples Parent</name> @@ -229,8 +229,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/e...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/exam...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/examples...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/exampl...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/examples/...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/examples/parent</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/examples/pom.xml =================================================================== --- branches/4.0.0.M5/examples/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -34,7 +34,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>examples-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces Examples: Aggregator</name> @@ -54,9 +54,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/e...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/exam...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/examples</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/examples</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/examples</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/examples</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/examples/push-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/push-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/push-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,14 +24,14 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>push-demo</artifactId> <packaging>war</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Examples: Push</name> <properties> @@ -196,8 +196,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/e...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/exam...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/examples...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/exampl...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/examples/...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/examples/push...</url> </scm> </project> Modified: branches/4.0.0.M5/examples/repeater-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/repeater-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/repeater-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,14 +25,14 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>repeater-demo</artifactId> <packaging>war</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Examples: Repeater</name> <properties> Modified: branches/4.0.0.M5/examples/richfaces-showcase/pom.xml =================================================================== --- branches/4.0.0.M5/examples/richfaces-showcase/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/richfaces-showcase/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -7,13 +7,13 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-showcase</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>Richfaces Examples: Richfaces Showcase Application</name> @@ -425,8 +425,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/examples/richfaces-sh...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project> Modified: branches/4.0.0.M5/examples/template/pom.xml =================================================================== --- branches/4.0.0.M5/examples/template/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/template/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -3,14 +3,14 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples</groupId> <artifactId>template</artifactId> <packaging>war</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>examples template</name> <dependencies> </dependencies> Modified: branches/4.0.0.M5/examples/validator-demo/pom.xml =================================================================== --- branches/4.0.0.M5/examples/validator-demo/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/examples/validator-demo/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -12,7 +12,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>validator-demo</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces Examples: Validators</name> <packaging>war</packaging> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.examples</groupId> <artifactId>template</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <type>war</type> </dependency> <dependency> Modified: branches/4.0.0.M5/parent/pom.xml =================================================================== --- branches/4.0.0.M5/parent/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/parent/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -23,13 +23,13 @@ <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> <packaging>pom</packaging> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>RichFaces Root Parent</name> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../bom/pom.xml</relativePath> </parent> @@ -394,11 +394,11 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/p... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/parent </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/parent + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/parent </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/parent</url> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/parent</url> </scm> </project> Modified: branches/4.0.0.M5/pom.xml =================================================================== --- branches/4.0.0.M5/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces Aggregator</name> @@ -59,8 +59,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5</url> </scm> </project> Modified: branches/4.0.0.M5/ui/common/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/common/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/common/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: branches/4.0.0.M5/ui/common/pom.xml =================================================================== --- branches/4.0.0.M5/ui/common/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/common/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Common Aggregator</name> Modified: branches/4.0.0.M5/ui/common/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/common/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/common/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: branches/4.0.0.M5/ui/core/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/core/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/core/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -20,7 +20,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: branches/4.0.0.M5/ui/core/pom.xml =================================================================== --- branches/4.0.0.M5/ui/core/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/core/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Core Aggregator</name> @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/core</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/core</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/core</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/core</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/core/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/core/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/core/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -23,7 +23,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -61,10 +61,10 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/cor... </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/c... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/core/ui </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/core/ui</url> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/core/ui</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/dist/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dist/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dist/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -22,13 +22,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-assembler</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Assembler</name> @@ -63,9 +63,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/dist</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/dist</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dist</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dist</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/dist</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dist/richfaces-components-api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dist/richfaces-components-api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,13 +24,13 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-components-api</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces UI Components API</name> @@ -180,8 +180,8 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/d...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/dist/...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dis...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dist/r...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/dist/richf...</url> </scm> </project> Modified: branches/4.0.0.M5/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dist/richfaces-components-ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dist/richfaces-components-ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,13 +24,13 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-components-ui</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces UI Components UI</name> @@ -243,9 +243,9 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/d...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/dist/...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dis...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/dist/r...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/dist/richf...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/dnd/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dnd/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dnd/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -64,9 +64,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/outpu...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/out...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output/pan...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/dnd/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dnd/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dnd/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.dnd</groupId> <artifactId>richfaces-ui-dnd-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Drag-n-Drop Aggregator</name> @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/output</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/dnd/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/dnd/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/dnd/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -77,9 +77,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/outpu...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/out...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output/pan...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/input/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/input/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/input/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: branches/4.0.0.M5/ui/input/pom.xml =================================================================== --- branches/4.0.0.M5/ui/input/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/input/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.input</groupId> <artifactId>richfaces-ui-input-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Input Aggregator</name> @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/i...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/input</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/input</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/input</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/input</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/input/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/input/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/input/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: branches/4.0.0.M5/ui/iteration/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/iteration/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/iteration/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -54,9 +54,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/i...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/itera...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/ite...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/iterat...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/iteration/...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/iteration/pom.xml =================================================================== --- branches/4.0.0.M5/ui/iteration/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/iteration/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Iteration Aggregator</name> @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/i...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/itera...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/ite...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/iteration</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/iteration</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/iteration/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/iteration/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/iteration/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -60,8 +60,8 @@ </build> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/i...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/itera...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/ite...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/iterat...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/iteration/...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/misc/pom.xml =================================================================== --- branches/4.0.0.M5/ui/misc/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/misc/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Miscellanous Aggregator</name> @@ -40,9 +40,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/misc</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/misc</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/misc</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/misc</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/misc</url> </scm> </project> Modified: branches/4.0.0.M5/ui/misc/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/misc/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/misc/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,13 +24,13 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces UI Misc UI</name> @@ -155,10 +155,10 @@ </profiles> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/mis... </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/m... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/misc/d... </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/misc/...</url> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/misc/dist/...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/output/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/output/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/output/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -51,10 +51,10 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/out...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output... </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/outpu...</url> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output/pan...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/output/pom.xml =================================================================== --- branches/4.0.0.M5/ui/output/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/output/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.output</groupId> <artifactId>richfaces-ui-output-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: Output Aggregator</name> @@ -41,8 +41,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/output</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/output/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/output/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/output/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -76,9 +76,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/o...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/outpu...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/out...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/output...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/output/pan...</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/parent/pom.xml =================================================================== --- branches/4.0.0.M5/ui/parent/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/parent/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,13 +25,13 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components Parent</name> <packaging>pom</packaging> @@ -194,8 +194,8 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/p...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/parent</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/parent</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/parent</url> </scm> </project> \ No newline at end of file Modified: branches/4.0.0.M5/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -31,7 +31,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-aggregator</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RichFaces UI: Aggregator</name> @@ -49,8 +49,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/build/parent/tag...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/build/parent/tags/4...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/modules/build/parent/tags/4.0.0...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/build/parent/bra...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/build/parent/branch...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/modules/build/parent/branches/4...</url> </scm> </project> Modified: branches/4.0.0.M5/ui/validator/api/pom.xml =================================================================== --- branches/4.0.0.M5/ui/validator/api/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/validator/api/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -25,7 +25,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -60,9 +60,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/v...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/valid...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/val...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/valida...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/validator/api</url> </scm> </project> Modified: branches/4.0.0.M5/ui/validator/pom.xml =================================================================== --- branches/4.0.0.M5/ui/validator/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/validator/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-root-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.validator</groupId> @@ -38,8 +38,8 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/v...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/valid...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/val...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/validator</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/validator</url> </scm> </project> Modified: branches/4.0.0.M5/ui/validator/ui/pom.xml =================================================================== --- branches/4.0.0.M5/ui/validator/ui/pom.xml 2010-12-26 17:19:44 UTC (rev 20799) +++ branches/4.0.0.M5/ui/validator/ui/pom.xml 2010-12-26 17:21:38 UTC (rev 20800) @@ -24,7 +24,7 @@ <parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> - <version>4.0.0.20101226-M5</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> @@ -135,8 +135,8 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/u...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/4.0.0.20101226-M5/ui/v...</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/4.0.0.20101226-M5/ui/valid...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/val...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/4.0.0.M5/ui/valida...</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/branches/4.0.0.M5/ui/validator/ui</url> </scm> </project>

14 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2010