February 2010 - richfaces-svn-commits

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

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

Author: abelevich Date: 2010-02-19 11:47:57 -0500 (Fri, 19 Feb 2010) New Revision: 16473 Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable-test.js Log: Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml 2010-02-19 16:47:57 UTC (rev 16473) @@ -0,0 +1,96 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <component> + <component-type>org.richfaces.DataTable</component-type> + <component-class>org.richfaces.component.html.HtmlDataTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + + <component> + <component-type>org.richfaces.ExtendedDataTable</component-type> + <component-class>org.richfaces.component.html.HtmlExtendedDataTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + <component> + <component-type>org.richfaces.Column</component-type> + <component-class>org.richfaces.component.html.HtmlColumn</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + <component> + <component-type>org.richfaces.ColumnGroup</component-type> + <component-class>org.richfaces.component.html.HtmlColumnGroup</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + <component> + <component-type>org.richfaces.SubTable</component-type> + <component-class>org.richfaces.component.html.HtmlSubTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + <component> + <component-type>org.richfaces.ToggleControl</component-type> + <component-class>org.richfaces.component.html.HtmlToggleControl</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate> + </component-extension> + </component> + + <render-kit> + <render-kit-id>HTML_BASIC</render-kit-id> + <renderer> + <component-family>org.richfaces.Data</component-family> + <renderer-type>org.richfaces.DataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.DataTableRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Data</component-family> + <renderer-type>org.richfaces.SubTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.SubTableRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Column</component-family> + <renderer-type>org.richfaces.ColumnGroupRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.ColumnGroupRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Data</component-family> + <renderer-type>org.richfaces.ExtendedDataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.ExtendedDataTableRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> \ No newline at end of file Added: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable-test.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable-test.js (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable-test.js 2010-02-19 16:47:57 UTC (rev 16473) @@ -0,0 +1,51 @@ +(function(jQuery, RichFaces) { + + RichFaces.ui = RichFaces.ui || {}; + + RichFaces.ui.DataTable = function(id, options) { + this.id = id; + this.options = options; + this.sortField = options.sortField; + this.init(options); + + } + + jQuery.extend(RichFaces.ui.DataTable.prototype, ( function () { + + var clientToggle = function(e, data) { + }; + + var serverToggle = function(e,data){ + }; + + var ajaxToggle = function(event,data){ + var component = event.data.component; + + component.save(data.source); + + var params = {"source": data.source, "javax.faces.partial.render":"@all"}; + var id = component.id; + jsf.ajax.request(id, event, params); + }; + + return { + init: function(options) { + this.switchType = options.switchType; + RichFaces.Event.bindById(this.id, 'RICH:sort', this.toggle, this); + }, + + toggle: function(e,elem, d) { + ajaxToggle(e,d); + }, + + save: function(state) { + var fieldToSave = jQuery(document.getElementById(this.sortField)); + fieldToSave.attr('value', state); + } + + } + + })()); + +})(jQuery, window.RichFaces); +

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16472 - in root/ui-sandbox/trunk/components/tables: api/src/main/java/org/richfaces/event and 13 other directories.

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

Author: abelevich Date: 2010-02-19 11:45:49 -0500 (Fri, 19 Feb 2010) New Revision: 16472 Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingEvent.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingListener.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingEvent.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingListener.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/Field.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortField.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataScroller.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/ToggleBehavior.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/tag/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/tag/ToggleHandler.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataScrollerRenderBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/ColumnVisualModelImpl.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js Log: start refactor for A2, remove vm logic from components, refactor component renderers, add Sort, Expand event classes, dataScroller base render/ui. switcj off subTables expand feature, prepare to remove togglerComponent Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -4,10 +4,10 @@ import org.richfaces.event.ToggleListener; -//TODO nick - move to API +//TODO: nick - move to API public interface Expandable { - //TODO nick - setExpanded() + //TODO: nick - setExpanded() public boolean isExpanded(); public void addToggleListener(ToggleListener listener); Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingEvent.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingEvent.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingEvent.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,24 @@ +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +public class PagingEvent extends FacesEvent { + + public PagingEvent(UIComponent component) { + super(component); + } + + private static final long serialVersionUID = -8176111805839316345L; + + @Override + public boolean isAppropriateListener(FacesListener listener) { + return (listener instanceof PagingListener); + } + + @Override + public void processListener(FacesListener listener) { + ((PagingListener) listener).processPaging(this); + } +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingListener.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingListener.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/PagingListener.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,9 @@ +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +public interface PagingListener extends FacesListener { + + public void processPaging(PagingEvent event); + +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingEvent.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingEvent.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingEvent.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,48 @@ +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; +import javax.swing.SortOrder; + +public class SortingEvent extends FacesEvent { + + private static final long serialVersionUID = 2125258204996535522L; + + private SortOrder sortOrder; + + private String columnId; + + + public SortingEvent(UIComponent source, String columnId, SortOrder sortOrder) { + super(source); + this.sortOrder = sortOrder; + this.setColumnId(columnId); + } + + @Override + public boolean isAppropriateListener(FacesListener listener) { + return (listener instanceof SortingListener); + } + + @Override + public void processListener(FacesListener listener) { + ((SortingListener)listener).processSorting(this); + } + + public void setSortOrder(SortOrder sortOrder) { + this.sortOrder = sortOrder; + } + + public SortOrder getSortOrder() { + return sortOrder; + } + + public void setColumnId(String columnId) { + this.columnId = columnId; + } + + public String getColumnId() { + return columnId; + } +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingListener.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingListener.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/SortingListener.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,9 @@ +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +public interface SortingListener extends FacesListener { + + public void processSorting(SortingEvent sortingEvent); + +} Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -6,7 +6,6 @@ * @author Anton Belevich * */ -//TODO nick - move to api public interface ToggleListener extends FacesListener { public void processToggle(ToggleEvent event); Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/Field.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/Field.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/Field.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,44 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.model; + +import javax.el.Expression; + +/** + * @author Konstantin Mishin + * + */ +public abstract class Field { + + private Expression expression; + + public Field(Expression expression) { + this.expression = expression; + } + + public Expression getExpression() { + return expression; + } + + public void setExpression(Expression expression) { + this.expression = expression; + } +} Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortField.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortField.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortField.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,22 @@ +package org.richfaces.model; + +import javax.el.Expression; +import javax.swing.SortOrder; + +public class SortField extends Field { + + private SortOrder sortOrder; + + public SortField(SortOrder sortOrder, Expression expression) { + super(expression); + this.sortOrder = sortOrder; + } + + public void setSortOrder(SortOrder sortOrder) { + this.sortOrder = sortOrder; + } + + public SortOrder getSortOrder() { + return sortOrder; + } +} Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,5 +1,7 @@ package org.richfaces.model.visual; +import javax.el.ValueExpression; + import org.richfaces.model.Ordering; /** @@ -11,5 +13,10 @@ public void setSortOrdering(Ordering sortOrder); public Ordering getSortOder(); + + public ValueExpression getSortBy(); + + public void setSortBy(ValueExpression sortBy); + } Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,17 +1,22 @@ package org.richfaces.model.visual; import java.util.Collection; - +import org.richfaces.model.SortField; import org.richfaces.model.SortMode; public interface SortingFilteringVisualModel { public SortMode getSortMode(); - public void setSortMode(SortMode sortMode); - - public Collection<String> getSortPriority(); - - public void setSortPriority(Collection<String> sortPriority); - + public void setSortMode(SortMode sortMode); + + public void setSortPriority(Collection sortPriority); + + public Collection getSortPriority(); + + public Collection <SortField> getSortFields(); + + public void addSortField(String id, SortField field); + + public SortField getSortField(String id); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -24,6 +24,8 @@ import javax.faces.component.UIComponent; +import org.richfaces.component.Column; + /** * Iterator for all children table columns. * Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -24,6 +24,8 @@ import javax.faces.component.UIComponent; +import org.richfaces.component.Column; + //TODO nick - rename to include component name class DataIterator extends IteratorBase<UIComponent> { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/FixedChildrenIterator.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -24,6 +24,7 @@ import javax.faces.component.UIComponent; + class FixedChildrenIterator extends DataIterator { private Iterator<UIComponent> currentColumnIterator; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/SubtableFixedChildrenIterator.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -22,6 +22,7 @@ import javax.faces.component.UIComponent; + /** * @author asmirnov * Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,77 +1,33 @@ package org.richfaces.component; -import javax.el.MethodExpression; +import javax.swing.SortOrder; -import org.richfaces.model.Ordering; public abstract class UIColumn extends javax.faces.component.UIColumn implements Column { - public abstract void setRowspan(int rowspan); + private SortOrder sortOrder; + public abstract int getRowspan(); - public abstract void setColspan(int colspan); public abstract int getColspan(); - public abstract void setSortEvent(String sortEvent); - public abstract String getSortEvent(); + public abstract boolean isBreakBefore(); - //TODO: anton - add get/set sortIcon Asc/Desc/Unsort methods to the dataTable - public abstract void setSortIconAsc(String sortIcon); - public abstract String getSortIconAsc(); - - public abstract void setSortIconDesc(String sortIcon); - public abstract String getSortIconDesc(); - - public abstract void setSortIconUnsort(String sortIcon); - public abstract String getSortIconUnsort(); - - - - /** - * SortOrder is an enumeration of the possible sort orderings. - * - * @param sortOrder - */ - - //TODO nick - use annotation from Swing? - //TODO anton - do you mean using javax.swing.SortOrder instead org.richfaces.model.Orderinbg??? - public abstract void setSortOrder(Ordering sortOrder); - public abstract Ordering getSortOrder(); - - /** - * expression used for column sorting. - * literal value is treated as property of data object - * EL-expression is evaluated on every data row - * @param sortExpression - */ - //TODO nick - use ValueExpression - public abstract void setSortExpression(String sortExpression); - public abstract String getSortExpression(); - - - - //TODO nick - "filterExpression" is missing - - public abstract void setFilterMethod(MethodExpression methodExpression); - public abstract MethodExpression getFilterMethod(); - - //TODO nick - make this java.lang.Object. Use case: Long or Enum used as filtering criteria - public abstract void setFilterValue(String filterValue); - public abstract String getFilterValue(); - - public abstract void setSelfSorted(boolean selfSorted); public abstract boolean isSelfSorted(); - /** - * Out this column on new row - * @parameter - * @return the acceptClass - */ - public abstract boolean isBreakBefore(); - - /** - * @param newBreakBefore the value to set - */ - public abstract void setBreakBefore(boolean breakBefore); + public abstract void setSortOrder(SortOrder sortOrder); + public abstract SortOrder getSortOrder(); + + + public SortOrder toggleSortOrder(){ + if(SortOrder.ASCENDING.equals(getSortOrder())) { + sortOrder = SortOrder.DESCENDING; + } else { + sortOrder = SortOrder.ASCENDING; + } + + return sortOrder; + } + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -34,12 +34,11 @@ * JSF component class * */ -public abstract class UIColumnGroup extends UIPanel implements Row, Column { - public static final String COMPONENT_TYPE = "org.richfaces.ColumnGroup"; - public static final String COMPONENT_FAMILY = "org.richfaces.ColumnGroup"; +public abstract class UIColumnGroup extends UIPanel implements Row, Column { + public Iterator<UIComponent> columns() { return new ColumnsIterator(this); } @@ -60,10 +59,4 @@ //TODO nick - implement in the proper way visitor.process(context, null, argument); } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - } Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataScroller.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataScroller.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,9 @@ +package org.richfaces.component; + +import javax.faces.component.UIComponentBase; + +public abstract class UIDataScroller extends UIComponentBase { + + public abstract String getForId(); + +} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,121 +1,41 @@ package org.richfaces.component; -import java.util.Collection; - -import javax.el.ELContext; -import javax.el.ValueExpression; +import javax.el.MethodExpression; import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import javax.faces.event.PhaseId; import org.ajax4jsf.model.DataComponentState; import org.richfaces.component.state.DataTableState; -import org.richfaces.model.SortMode; -import org.richfaces.model.visual.DataTableVisualModel; -import org.richfaces.model.visual.SortingFilteringVisualModel; -import org.richfaces.model.visual.impl.DataTableVisualModelImpl; -import org.richfaces.model.visual.impl.SortingFilteringVisualModelImpl; +import org.richfaces.event.SortingEvent; /** * @author Anton Belevich * */ + public abstract class UIDataTable extends UIDataTableBase { - private DataTableVisualModel visualModel; - - private SortMode sortMode; - - private Collection<String> sortPriority; - enum PropertyKeys { - sortingFilteringVisualModel + sortingExpression } - public void setVisualModel(DataTableVisualModel visualModel) { - this.visualModel = visualModel; + public void setSortingListener(MethodExpression sortingExpression) { + //TODO nick - use addToggleListener() & MethodExpression wrapper in tag + getStateHelper().put(PropertyKeys.sortingExpression, sortingExpression); } + + public MethodExpression getSortingListener() { + return (MethodExpression) getStateHelper().eval(PropertyKeys.sortingExpression); + } public DataTableState getCurrentComponentState() { return (DataTableState) getComponentState(); } - public void setSortingFilteringVisualModel(SortingFilteringVisualModel sortingFilteringVisualModel){ - getStateHelper().put(PropertyKeys.sortingFilteringVisualModel, sortingFilteringVisualModel); - } - - public SortingFilteringVisualModel getSortingFilteringVisualModel(){ - return (SortingFilteringVisualModel)getStateHelper().eval(PropertyKeys.sortingFilteringVisualModel); - } - - public DataTableVisualModel getVisualModel() { - - DataTableState dataTableState = getCurrentComponentState(); - DataTableVisualModel model = dataTableState.getVisualModel(); - - if(model == null) { - - if(visualModel == null) { - - ELContext elContext = getFacesContext().getELContext(); - ValueExpression modelExpression = getValueExpression("visualModel"); - - if(modelExpression != null) { - model = (DataTableVisualModel) modelExpression.getValue(elContext); - } - - if(model == null) { - model = new DataTableVisualModelImpl(); - - if ((modelExpression != null) && (!modelExpression.isReadOnly(elContext))) { - //TODO nick - handle ELException - modelExpression.setValue(elContext, model); - } - } - - } else { - model = visualModel; - } - - if(model.getSortingFilteringVisualModel() == null) { - model.setSortingFilteringVisualModel(initSortingFilteringVisualModel()); - } else { - //TODO nick - init SortingFilteringVisualModel from model - } - } - - dataTableState.setVisualModel(model); - - return model; - } - - protected SortingFilteringVisualModel initSortingFilteringVisualModel() { - SortingFilteringVisualModel sortingFilteringVisualModel = getSortingFilteringVisualModel(); - if(sortingFilteringVisualModel == null) { - sortingFilteringVisualModel = new SortingFilteringVisualModelImpl(); - } - - sortingFilteringVisualModel.setSortMode(sortMode); - sortingFilteringVisualModel.setSortPriority(sortPriority); - - return sortingFilteringVisualModel; - } - - public void setSortMode(SortMode sortMode) { - this.sortMode = sortMode; - } - - public SortMode getSortMode() { - return getVisualModel().getSortingFilteringVisualModel().getSortMode(); - } - - public void setSortPriority(Collection<String> sortPriority){ - this.sortPriority = sortPriority; - } - - public Collection<String> getSortPriority() { - return getVisualModel().getSortingFilteringVisualModel().getSortPriority(); - } - @Override protected DataComponentState createComponentState() { return new DataTableState(getFirst(), getRows()); @@ -125,79 +45,40 @@ return getFacet("caption"); } - //TODO nick - move methods that work with CSS classes into renderer - public String getTableSkinClass() { - return "rich-table"; - } - - public String getCaptionSkinClass() { - return "rich-table-caption"; - } - @Override - public String getFirstRowSkinClass() { - return "rich-table-first-row"; - } + public void broadcast(FacesEvent event) throws AbortProcessingException { + super.broadcast(event); + if(event instanceof SortingEvent) { + SortingEvent sortingEvent = (SortingEvent)event; + + DataTableState state = getCurrentComponentState(); + if(event.isAppropriateListener(state)) { + sortingEvent.processListener(state); + } + + MethodExpression expression = getSortingListener(); + FacesContext context = getFacesContext(); - @Override - public String getRowSkinClass() { - return "rich-table-row"; + if (expression != null) { + expression.invoke(context.getELContext(), new Object[] { sortingEvent }); + } + + } } - public String getCellSkinClass() { - return "rich-table-cell"; - } - - public String getHeaderSkinClass() { - return "rich-table-header"; - } - + @Override - public String getHeaderFirstSkinClass() { - return "rich-table-header-first"; + public void queueEvent(FacesEvent event) { + if(event instanceof SortingEvent) { + //TODO immediate ??? + event.setPhaseId(PhaseId.INVOKE_APPLICATION); + } + super.queueEvent(event); + } - public String getHeaderCellSkinClass() { - return "rich-table-header-cell"; - } + public String[] getHiddenInputId() { + return (new String[]{getClientId()+ ":sort"}); + } - public String getColumnHeaderSkinClass() { - return "rich-table-subheader"; - } - - @Override - public String getColumnHeaderFirstSkinClass() { - return "rich-table-subheader-first"; - } - - public String getColumnHeaderCellSkinClass() { - return "rich-table-subheader-cell"; - } - - public String getColumnFooterSkinClass() { - return "rich-table-subfooter"; - } - - @Override - public String getColumnFooterFirstSkinClass() { - return "rich-table-subfooter-first"; - } - - public String getColumnFooterCellSkinClass() { - return "rich-table-subfooter-cell"; - } - - public String getFooterSkinClass() { - return "rich-table-footer"; - } - - @Override - public String getFooterFirstSkinClass() { - return "rich-table-footer-first"; - } - - public String getFooterCellSkinClass() { - return "rich-table-footer-cell"; - } - } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,5 +1,6 @@ package org.richfaces.component; +import java.util.Collection; import java.util.Iterator; import javax.faces.component.UIComponent; @@ -29,7 +30,7 @@ public UIComponent getFooter() { return getFacet("footer"); } - + @Override public boolean getRendersChildren() { return true; @@ -38,37 +39,10 @@ public abstract SortMode getSortMode(); public abstract void setSortMode(SortMode sortMode); - - public abstract String getTableSkinClass(); - public abstract String getFirstRowSkinClass(); - - public abstract String getRowSkinClass(); - - public abstract String getHeaderCellSkinClass(); - - public abstract String getHeaderSkinClass(); - - public abstract String getHeaderFirstSkinClass(); + public abstract Collection <Object> getSortPriority(); - public abstract String getColumnHeaderCellSkinClass(); - - public abstract String getColumnHeaderSkinClass(); + public abstract void setSortPriority(Collection<Object> sortPriority); - public abstract String getColumnHeaderFirstSkinClass(); - public abstract String getFooterCellSkinClass(); - - public abstract String getFooterSkinClass(); - - public abstract String getFooterFirstSkinClass(); - - public abstract String getColumnFooterCellSkinClass(); - - public abstract String getColumnFooterSkinClass(); - - public abstract String getColumnFooterFirstSkinClass(); - - public abstract String getCellSkinClass(); - } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -21,9 +21,7 @@ package org.richfaces.component; -import javax.el.ELContext; import javax.el.MethodExpression; -import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; @@ -35,73 +33,24 @@ import org.richfaces.component.state.SubTableState; import org.richfaces.event.ToggleEvent; import org.richfaces.event.ToggleListener; -import org.richfaces.model.visual.SubTableVisualModel; -import org.richfaces.model.visual.impl.SubTableVisualModelImpl; /** * JSF component class * */ + public abstract class UISubTable extends UIDataTableBase implements Row, Column, Expandable { - public static final String COMPONENT_TYPE = "org.richfaces.SubTable"; - - public static final String COMPONENT_FAMILY = "org.richfaces.SubTable"; - public static final String SWITCH_TYPE_SERVER = "server"; - public static final String SWITCH_TYPE_CLIENT = "client"; - public static final String SWITCH_TYPE_AJAX = "ajax"; - private boolean expanded; - - private SubTableVisualModel visualModel; - - // private SubTableState componentState; - + enum PropertyKeys { - switchType, expanded, toggleExpression, childState, visualModel + switchType, expanded, toggleExpression } - public SubTableVisualModel getVisualModel() { - // TODO refactor - - SubTableVisualModel model = getCurrentComponentState().getCurrentRowModel(); - - if (model == null) { - - if (visualModel == null) { - - ELContext elContext = getFacesContext().getELContext(); - ValueExpression modelExpression = getValueExpression("visualModel"); - if (modelExpression != null) { - model = (SubTableVisualModel) modelExpression.getValue(elContext); - } - - if (model == null) { - model = new SubTableVisualModelImpl(); - model.setExpanded(expanded); - - if ((modelExpression != null) && (!modelExpression.isReadOnly(elContext))) { - modelExpression.setValue(elContext, model); - } - } - } else { - model = visualModel; - } - - getCurrentComponentState().setCurrentRowModel(model); - } - - return model; - } - - public void setVisualModel(SubTableVisualModel visualModel) { - this.visualModel = visualModel; - } - public boolean isBreakBefore() { return true; } @@ -176,14 +125,10 @@ return state; } - public void setExpanded(boolean expanded) { - this.expanded = expanded; - } + public abstract void setExpanded(boolean expanded); - public boolean isExpanded() { - return getVisualModel().isExpanded(); - } - + public abstract boolean isExpanded(); + public void setToggleListener(MethodExpression toggleExpression) { //TODO nick - use addToggleListener() & MethodExpression wrapper in tag getStateHelper().put(PropertyKeys.toggleExpression, toggleExpression); @@ -197,13 +142,8 @@ public void queueEvent(FacesEvent event) { //TODO nick - what if event comes from the nested subTable? if (event instanceof ToggleEvent) { - //TODO nick - why Ajax is processing at special phase? //TODO nick - "immediate" support? - if(getSwichType().equals(SWITCH_TYPE_AJAX)) { - event.setPhaseId(PhaseId.INVOKE_APPLICATION); - } else { - event.setPhaseId(PhaseId.UPDATE_MODEL_VALUES); - } + event.setPhaseId(PhaseId.INVOKE_APPLICATION); } super.queueEvent(event); } @@ -233,7 +173,7 @@ toggle.addRenderId(getClientId(context)); } } - + public void addToggleListener(ToggleListener listener) { addFacesListener(listener); } @@ -245,104 +185,6 @@ public ToggleListener[] getToggleListeners() { return (ToggleListener[]) getFacesListeners(ToggleListener.class); } - - @Override - public boolean getRendersChildren() { - return true; - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - //TODO nick - these methods are renderer-specific, should be moved to renderer-related code - @Override - public String getRowSkinClass() { - return "rich-subtable-row"; - } - - @Override - public String getFirstRowSkinClass() { - return "rich-subtable-first-row"; - } - - public String getHeaderRowSkinClass() { - return "rich-subtable-header-row"; - } - - public String getHeaderFirstRowSkinClass() { - return "rich-subtable-header-first"; - } - - public String getCellSkinClass() { - return "rich-subtable-cell"; - } - - public String getHeaderCellSkinClass() { - return "rich-subtable-header-cell"; - } - - - public String getColumnHeaderCellSkinClass() { - return "rich-subtable-subheader-cell"; - } - - public String getColumnHeaderSkinClass() { - return "rich-subtable-subheader"; - } - - public String getFooterCellSkinClass() { - return "rich-subtable-footer-cell"; - } - - public String getFooterSkinClass() { - return "rich-subtable-footer"; - } - - public String getFooterFirstRowSkinClass() { - return "rich-subtable-footer-first"; - } - - public String getColumnFooterCellSkinClass() { - return "rich-subtable-subfooter-cell"; - } - - public String getColumnFooterSkinClass() { - return "rich-subtable-subfooter-cell"; - } - - public String getTableSkinClass() { - return null; - } - - public String getTableHeadSkinClass() { - return null; - } - - @Override - public String getColumnFooterFirstSkinClass() { - return "rich-subtable-subfooter-first"; } - - @Override - public String getColumnHeaderFirstSkinClass() { - return "rich-subtable-subheader-first"; - } - - @Override - public String getFooterFirstSkinClass() { - return "rich-subtable-footer-first"; - } - - @Override - public String getHeaderFirstSkinClass() { - return "rich-subtable-header-first"; - } - - @Override - public String getHeaderSkinClass() { - return "rich-subtable-header"; - } } Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/ToggleBehavior.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/ToggleBehavior.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/behavior/ToggleBehavior.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,50 @@ +package org.richfaces.component.behavior; + +import javax.faces.component.behavior.ClientBehaviorBase; +import javax.faces.component.behavior.FacesBehavior; + + +//TODO: anton need implement base class for our behaviors +@FacesBehavior(value="org.richfaces.behavior.ToggleBehavior") +public class ToggleBehavior extends ClientBehaviorBase { + + public static final String BEHAVIOR_ID = "org.richfaces.behavior.ToggleBehavior"; + + private String toggleEvent; + + private String toggleComponent; + + private String toggleSource; + + + public String getToggleSource() { + return toggleSource; + } + + public void setToggleSource(String toogleSource) { + this.toggleSource = toogleSource; + } + + public String getToggleEvent() { + //TODO: anton - eval valueExpression + return toggleEvent; + } + + public String getToggleComponentId() { + //TODO: anton - eval valueExpression + return toggleComponent; + } + + public void setToggleComponent(String toggleComponent) { + this.toggleComponent = toggleComponent; + } + + public void setToggleEvent(String toggleEvent) { + this.toggleEvent = toggleEvent; + } + + @Override + public String getRendererType() { + return BEHAVIOR_ID; + } +} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,31 +1,22 @@ package org.richfaces.component.html; -import javax.el.MethodExpression; +import javax.swing.SortOrder; import org.richfaces.component.UIColumn; -import org.richfaces.model.Ordering; public class HtmlColumn extends UIColumn { enum PropertyKeys { - breakBefore, rowspan, colspan, sortEvent, sortOrder, selfSorted, sortBy, sortIconAsc, sortIconDesc, sortIconUnsort + breakBefore, rowspan, colspan, sortOrder, selfSorted, sortBy } public static final String COMPONENT_TYPE = "org.richfaces.Column"; + public static final String COMPONENT_FAMILY = "org.richfaces.Column"; - public void setBreakBefore(boolean breakBefore) { - getStateHelper().put(PropertyKeys.breakBefore, Boolean.valueOf(breakBefore)); - } - - public boolean isBreakBefore() { - Boolean breakBefore = ((Boolean) getStateHelper().eval(PropertyKeys.breakBefore, Boolean.FALSE)); - return breakBefore.booleanValue(); - } - + public int getColspan() { - Integer colspan = (Integer) getStateHelper().eval(PropertyKeys.colspan, Integer.MIN_VALUE); - return colspan.intValue(); + return (Integer) getStateHelper().eval(PropertyKeys.colspan, Integer.MIN_VALUE); } public void setColspan(int colspan) { @@ -33,8 +24,7 @@ } public int getRowspan() { - Integer rowspan = (Integer) getStateHelper().eval(PropertyKeys.rowspan, Integer.MIN_VALUE); - return rowspan.intValue(); + return (Integer) getStateHelper().eval(PropertyKeys.rowspan, Integer.MIN_VALUE); } public void setRowspan(int rowspan) { @@ -42,41 +32,15 @@ } @Override - public String getSortEvent() { - //TODO: anton - pass correct event name to the client ... - return (String)getStateHelper().eval(PropertyKeys.sortEvent, "click"); + public SortOrder getSortOrder() { + return (SortOrder) getStateHelper().eval(PropertyKeys.sortOrder,SortOrder.DESCENDING); } - + @Override - public Ordering getSortOrder() { - return (Ordering) getStateHelper().eval(PropertyKeys.sortOrder,Ordering.DESCENDING); + public void setSortOrder(SortOrder sortOrder) { + getStateHelper().put(PropertyKeys.sortOrder, sortOrder); } - @Override - public void setSortEvent(String sortEvent) { - getStateHelper().put(PropertyKeys.sortEvent, sortEvent); - } - - @Override - public void setSortOrder(Ordering sortOrder) { - getStateHelper().put(PropertyKeys.sortOrder, sortOrder); - } - - public MethodExpression getFilterMethod() { - // TODO Auto-generated method stub - return null; - } - - public String getFilterValue() { - // TODO Auto-generated method stub - return null; - } - - public String getSortExpression() { - // TODO Auto-generated method stub - return null; - } - public boolean isSelfSorted() { return (Boolean)getStateHelper().eval(PropertyKeys.selfSorted, true); } @@ -85,32 +49,6 @@ getStateHelper().put(PropertyKeys.selfSorted, selfSorted); } - - public boolean isSortable() { - // TODO Auto-generated method stub - return false; - } - - public void setFilterMethod(MethodExpression methodExpression) { - // TODO Auto-generated method stub - - } - - public void setFilterValue(String filterValue) { - // TODO Auto-generated method stub - - } - - public void setSortExpression(String sortExpression) { - // TODO Auto-generated method stub - - } - - public void setSortable(boolean sortable) { - // TODO Auto-generated method stub - - } - public Object getSortBy() { return getStateHelper().eval(PropertyKeys.sortBy); } @@ -120,33 +58,11 @@ } @Override - public String getSortIconAsc() { - return (String)getStateHelper().get(PropertyKeys.sortIconAsc); + public boolean isBreakBefore() { + return (Boolean)getStateHelper().eval(PropertyKeys.breakBefore, false); } - - @Override - public String getSortIconDesc() { - return (String)getStateHelper().get(PropertyKeys.sortIconDesc); + + public void setBreakBefore(boolean breakBefore) { + getStateHelper().put(PropertyKeys.breakBefore, breakBefore); } - - @Override - public String getSortIconUnsort() { - return (String)getStateHelper().get(PropertyKeys.sortIconUnsort); - } - - @Override - public void setSortIconAsc(String sortIcon) { - getStateHelper().put(PropertyKeys.sortIconAsc, sortIcon); - } - - @Override - public void setSortIconDesc(String sortIcon) { - getStateHelper().put(PropertyKeys.sortIconDesc, sortIcon); - } - - @Override - public void setSortIconUnsort(String sortIcon) { - getStateHelper().put(PropertyKeys.sortIconUnsort, sortIcon); - } - } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -3,7 +3,11 @@ import org.richfaces.component.UIColumnGroup; public class HtmlColumnGroup extends UIColumnGroup { + + public static final String COMPONENT_TYPE = "org.richfaces.ColumnGroup"; + public static final String COMPONENT_FAMILY = "org.richfaces.Column"; + @Override public String getFamily() { return COMPONENT_FAMILY; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,19 +1,40 @@ package org.richfaces.component.html; +import java.util.Collection; + import org.richfaces.component.UIDataTable; +import org.richfaces.model.SortMode; public class HtmlDataTable extends UIDataTable { public static final String COMPONENT_TYPE = "org.richfaces.DataTable"; - public static final String COMPONENT_FAMILY = "org.richfaces.DataTable"; - + + protected enum PropertyKeys { + sortMode, sortPriority, + } + public HtmlDataTable() { setRendererType("org.richfaces.DataTableRenderer"); } @Override - public String getFamily() { - return COMPONENT_FAMILY; + public SortMode getSortMode() { + return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single); } -} + + @Override + public Collection<Object> getSortPriority() { + return (Collection)getStateHelper().eval(PropertyKeys.sortPriority); + } + + @Override + public void setSortMode(SortMode sortMode) { + getStateHelper().put(PropertyKeys.sortMode, sortMode); + } + + @Override + public void setSortPriority(Collection<Object> sortPriority) { + getStateHelper().put(PropertyKeys.sortPriority, sortPriority); + } + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -21,7 +21,10 @@ */ package org.richfaces.component.html; +import java.util.Collection; + import org.richfaces.component.UIExtendedDataTable; +import org.richfaces.model.SortMode; public class HtmlExtendedDataTable extends UIExtendedDataTable { @@ -58,13 +61,23 @@ public void setFrozenColumns(Integer frozenColumns) { getStateHelper().put(PropertyKeys.frozenColumns, frozenColumns); } - // - // public String getHeight() { - // return (String) getStateHelper().eval(PropertyKeys.height, ""); - // } - // - // public void setHeight(String height) { - // getStateHelper().put(PropertyKeys.height, height); - // } + @Override + public SortMode getSortMode() { + return null; + } + + @Override + public Collection<Object> getSortPriority() { + return null; + } + + @Override + public void setSortMode(SortMode sortMode) { + } + + @Override + public void setSortPriority(Collection<Object> sortPriority) { + } + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,25 +1,47 @@ package org.richfaces.component.html; +import java.util.Collection; + import org.richfaces.component.UISubTable; import org.richfaces.model.SortMode; public class HtmlSubTable extends UISubTable { + + public static final String COMPONENT_TYPE = "org.richfaces.SubTable"; + + + protected enum PropertyKeys { + expand, sortMode, sortPriority + } + @Override - public String getFamily() { - return COMPONENT_FAMILY; + public boolean isExpanded() { + return (Boolean)getStateHelper().eval(PropertyKeys.expand, false); } @Override + public void setExpanded(boolean expanded) { + getStateHelper().put(PropertyKeys.expand, expanded); + } + + @Override public SortMode getSortMode() { - // TODO Auto-generated method stub - return null; + return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single); } @Override + public Collection<Object> getSortPriority() { + return (Collection)getStateHelper().eval(PropertyKeys.sortPriority); + } + + @Override public void setSortMode(SortMode sortMode) { - // TODO Auto-generated method stub - + getStateHelper().put(PropertyKeys.sortMode, sortMode); } + @Override + public void setSortPriority(Collection<Object> sortPriority) { + getStateHelper().put(PropertyKeys.sortPriority, sortPriority); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -8,16 +8,15 @@ import org.ajax4jsf.model.DataComponentState; import org.ajax4jsf.model.RepeatState; -import org.richfaces.model.visual.DataTableVisualModel; +import org.richfaces.event.SortingEvent; +import org.richfaces.event.SortingListener; /** * @author Anton Belevich * */ -public class DataTableState extends RepeatState implements StateHolder { +public class DataTableState extends RepeatState implements StateHolder, SortingListener { - private DataTableVisualModel visualModel; - private Map<String, SubTableState> subTableStates = new HashMap<String, SubTableState>(); private int first; @@ -29,14 +28,6 @@ this.rows = rows; } - public void setVisualModel(DataTableVisualModel visualModel) { - this.visualModel = visualModel; - } - - public DataTableVisualModel getVisualModel() { - return this.visualModel; - } - @Override public int getFirst() { return this.first; @@ -87,4 +78,7 @@ DataComponentState state = getSubTableState(id); return state; } + + public void processSorting(SortingEvent sortingEvent) { + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -6,7 +6,6 @@ import org.ajax4jsf.model.RepeatState; import org.richfaces.event.ToggleEvent; import org.richfaces.event.ToggleListener; -import org.richfaces.model.visual.SubTableVisualModel; /** * @author Anton Belevich @@ -14,8 +13,6 @@ */ public class SubTableState extends RepeatState implements StateHolder, ToggleListener { - private SubTableVisualModel model; - private String id; private int first; @@ -46,24 +43,6 @@ return this.rows; } - public SubTableVisualModel getCurrentRowModel() { - return this.model; - } - - public void setCurrentRowModel(SubTableVisualModel model) { - this.model = model; - } - - //TODO nick - do we need to support SubTableVisualModel that are StateHolder? - public void restoreState(FacesContext context, Object state) { - Object[] currentState = (Object[]) state; - this.model = (SubTableVisualModel) currentState[0]; - } - - public Object saveState(FacesContext context) { - return new Object[] { this.model }; - } - public boolean isTransient() { return false; } @@ -72,7 +51,15 @@ } public void processToggle(ToggleEvent event) { - boolean newValue = event.isExpanded(); - this.model.setExpanded(newValue); } + + @Override + public void restoreState(FacesContext arg0, Object arg1) { + } + + @Override + public Object saveState(FacesContext arg0) { + return null; + } + } Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/tag/ToggleHandler.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/tag/ToggleHandler.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/facelets/tag/ToggleHandler.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,12 @@ +package org.richfaces.facelets.tag; + +import javax.faces.view.facelets.BehaviorConfig; +import javax.faces.view.facelets.BehaviorHandler; + +public class ToggleHandler extends BehaviorHandler { + + public ToggleHandler(BehaviorConfig config) { + super(config); + } + +} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/ColumnVisualModelImpl.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/ColumnVisualModelImpl.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/ColumnVisualModelImpl.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,5 +1,7 @@ package org.richfaces.model.visual.impl; +import javax.el.ValueExpression; + import org.richfaces.model.Ordering; import org.richfaces.model.visual.ColumnVisualModel; @@ -10,6 +12,10 @@ public class ColumnVisualModelImpl implements ColumnVisualModel { private Ordering sortOrder; + + private ValueExpression sortBy; + + private ValueExpression comparator; public ColumnVisualModelImpl() { } @@ -21,4 +27,17 @@ public void setSortOrdering(Ordering sortOrder) { this.sortOrder = sortOrder; } + + public ValueExpression getSortBy() { + return sortBy; + } + + public ValueExpression getComparator() { + return comparator; + } + + public void setSortBy(ValueExpression sortBy) { + // TODO Auto-generated method stub + + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,30 +1,51 @@ package org.richfaces.model.visual.impl; +import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedHashMap; +import org.richfaces.model.SortField; import org.richfaces.model.SortMode; import org.richfaces.model.visual.SortingFilteringVisualModel; +/** + * @author Anton Belevich + * + */ public class SortingFilteringVisualModelImpl implements SortingFilteringVisualModel { private SortMode sortMode; - private Collection<String> sortPriority; + private LinkedHashMap<String, SortField> sortFields = new LinkedHashMap<String, SortField>(); - public SortMode getSortMode() { - return sortMode; + private Collection<Object> sortPriority = new ArrayList<Object>(); + + public void addSortField(String id, SortField sortField) { + sortFields.put(id, sortField); } - public Collection<String> getSortPriority() { - return sortPriority; + public Collection<SortField> getSortFields() { + return sortFields.values(); } + public SortMode getSortMode() { + return this.sortMode; + } + public void setSortMode(SortMode sortMode) { this.sortMode = sortMode; } - public void setSortPriority(Collection<String> sortPriority) { + public SortField getSortField(String id) { + return sortFields.get(id); + } + + public Collection<Object> getSortPriority() { + return sortPriority; + } + + public void setSortPriority(Collection sortPriority) { this.sortPriority = sortPriority; } - } + Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -11,13 +11,12 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.component.Column; import org.richfaces.component.Row; import org.richfaces.component.UIDataTableBase; import org.richfaces.component.UISubTable; @ResourceDependencies(value = { @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js") }) + @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-event.js")}) public abstract class AbstractTableRenderer extends DataTableRowsRenderer { public static final String ROW_CLASS = "rowClass"; @@ -26,6 +25,7 @@ public static final String CELL_CLASS = "cellClass"; + public static final String SORTING = "sorting"; public boolean isColumnFacetPresent(UIDataTableBase table, String facetName) { Iterator<UIComponent> columns = table.columns(); @@ -140,9 +140,9 @@ dataTable.setRowKey(context, key); dataTable.restoreOrigValue(context); - String rowClass = dataTable.getRowSkinClass(); - String cellClass = dataTable.getCellSkinClass(); - String firstClass = dataTable.getFirstRowSkinClass(); + String rowClass = getRowSkinClass(); + String cellClass = getCellSkinClass(); + String firstClass = getFirstRowSkinClass(); rowClass = mergeStyleClasses("rowClass", rowClass, dataTable); cellClass = mergeStyleClasses("cellClass", cellClass, dataTable); @@ -162,15 +162,27 @@ public void encodeTableStart(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { writer.startElement(HTML.TABLE_ELEMENT, component); - String styleClass = component.getTableSkinClass(); + writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(), null); + String styleClass = getTableSkinClass(); encodeStyleClass(writer, context, component, HTML.STYLE_CLASS_ATTR, styleClass); } public void encodeTableEnd(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { writer.endElement(HTML.TABLE_ELEMENT); encodeClientScript(writer, context, component); + encodeSortHiddenInput(writer, context, component); } + public void encodeSortHiddenInput(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { + writer.startElement(HTML.INPUT_ELEM, component); + String clientId = component.getClientId() + ":sort"; + writer.writeAttribute(HTML.ID_ATTRIBUTE, clientId , null); + writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null); + writer.writeAttribute(HTML.NAME_ATTRIBUTE, clientId, null); + writer.writeAttribute(HTML.VALUE_ATTRIBUTE, null, null); + writer.endElement(HTML.INPUT_ELEM); + } + public abstract void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException; public void encodeTableBodyStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) @@ -213,9 +225,9 @@ if (columnFacetPresent) { - String rowClass = dataTable.getColumnFooterSkinClass(); - String cellClass = dataTable.getColumnFooterCellSkinClass(); - String firstClass = dataTable.getColumnFooterFirstSkinClass(); + String rowClass = getColumnFooterSkinClass(); + String cellClass = getColumnFooterCellSkinClass(); + String firstClass = getColumnFooterFirstSkinClass(); rowClass = mergeStyleClasses("columnFooterClass", rowClass, dataTable); cellClass = mergeStyleClasses("columnFooterCellClass", cellClass, dataTable); @@ -231,9 +243,9 @@ if (footer != null && footer.isRendered()) { - String rowClass = dataTable.getFooterSkinClass(); - String cellClass = dataTable.getFooterCellSkinClass(); - String firstClass = dataTable.getFooterFirstSkinClass(); + String rowClass = getFooterSkinClass(); + String cellClass = getFooterCellSkinClass(); + String firstClass = getFooterFirstSkinClass(); rowClass = mergeStyleClasses("footerClass", rowClass, dataTable); cellClass = mergeStyleClasses("footerCellClass", cellClass, dataTable); @@ -285,9 +297,9 @@ if (header != null && header.isRendered()) { - String rowClass = dataTable.getHeaderSkinClass(); - String cellClass = dataTable.getHeaderCellSkinClass(); - String firstClass = dataTable.getHeaderFirstSkinClass(); + String rowClass = getHeaderSkinClass(); + String cellClass = getHeaderCellSkinClass(); + String firstClass = getHeaderFirstSkinClass(); rowClass = mergeStyleClasses("headerClass", rowClass, dataTable); cellClass = mergeStyleClasses("headerCellClass", cellClass, dataTable); @@ -299,9 +311,9 @@ if (isEncodeHeaders) { - String rowClass = dataTable.getColumnHeaderSkinClass(); - String cellClass = dataTable.getColumnHeaderCellSkinClass(); - String firstClass = dataTable.getColumnHeaderFirstSkinClass(); + String rowClass = getColumnHeaderSkinClass(); + String cellClass = getColumnHeaderCellSkinClass(); + String firstClass = getColumnHeaderFirstSkinClass(); rowClass = mergeStyleClasses("columnHeaderClass", rowClass, dataTable); cellClass = mergeStyleClasses("columnHeaderCellClass", cellClass, dataTable); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -46,5 +46,101 @@ return new RowHolder(context, parent.getClientId(context),(UIColumnGroup)component); } + + @Override + public String getCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFirstRowSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRowSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getTableSkinClass() { + // TODO Auto-generated method stub + return null; + } } Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataScrollerRenderBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataScrollerRenderBase.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataScrollerRenderBase.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,28 @@ +package org.richfaces.renderkit; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.renderkit.RendererBase; +import org.richfaces.component.UIDataScroller; +import org.richfaces.component.UISubTable; + +public class DataScrollerRenderBase extends RendererBase{ + + @Override + protected void doDecode(FacesContext context, UIComponent component) { + + } + + protected UISubTable findComponent(FacesContext context, UIDataScroller ds) { + String forId = ds.getForId(); + + if (forId != null && forId.length() > 0) { + UIComponent subTable = getUtils().findComponentFor(context, ds, forId); + if (subTable instanceof UISubTable) { + return (UISubTable) subTable; + } + } + return null; + } +} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -1,8 +1,10 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -10,6 +12,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import javax.swing.SortOrder; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.RendererUtils.HTML; @@ -17,17 +20,57 @@ import org.richfaces.component.UIDataTable; import org.richfaces.component.UIDataTableBase; import org.richfaces.component.UISubTable; -import org.richfaces.component.util.FormUtil; +import org.richfaces.event.SortingEvent; import org.richfaces.model.Ordering; +import org.richfaces.model.SortMode; @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "datatable.js"), @ResourceDependency(name = "table.css") }) + @ResourceDependency(name= "richfaces-event.js"), @ResourceDependency(name = "datatable-test.js"), + @ResourceDependency(name = "table.css") }) public class DataTableRenderer extends AbstractTableRenderer { + @Override protected void doDecode(FacesContext context, UIComponent component) { - System.out.println("DataTableRenderer.doDecode()"); + Map<String, String> requestMap = context.getExternalContext().getRequestParameterMap(); + + //decode column + + UIDataTable dataTable = (UIDataTable)component; + + String sortColumn = requestMap.get(dataTable.getClientId()+":sort"); + + if(sortColumn != null && sortColumn.trim().length() > 0) { + Collection<Object> sortPriority = dataTable.getSortPriority(); + + boolean isSingle = SortMode.single.equals(dataTable.getSortMode()); + + if(isSingle) { + //reset saved sort priorities + sortPriority.clear(); + } + + Iterator<UIComponent> columns = dataTable.columns(); + while(columns.hasNext()) { + + UIComponent column = columns.next(); + + if(column instanceof org.richfaces.component.UIColumn && isSortable((org.richfaces.component.UIColumn)column)) { + + org.richfaces.component.UIColumn sortableColumn = (org.richfaces.component.UIColumn)column; + + if(sortableColumn.getClientId().equals(sortColumn)) { + SortOrder newSortOrder = sortableColumn.toggleSortOrder(); + new SortingEvent(dataTable, column.getClientId(context), newSortOrder).queue(); + sortPriority.add(sortColumn); + } else if(isSingle) { + sortableColumn.setSortOrder(SortOrder.UNSORTED); + } + + } + } + } } public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) @@ -54,9 +97,9 @@ writer.endElement("colgroup"); } - } + @Override public RowHolder createRowHolder(FacesContext context, UIComponent component) { return new RowHolder(context, (UIDataTable)component); @@ -142,7 +185,7 @@ writer.startElement(HTML.CAPTION_ELEMENT, dataTable); String captionClass = (String) dataTable.getAttributes().get("captionClass"); - String captionSkinClass = dataTable.getCaptionSkinClass(); + String captionSkinClass = getCaptionSkinClass(); captionClass = captionClass != null ? captionClass + " " + captionClass : captionSkinClass; writer.writeAttribute(HTML.CLASS_ATTRIBUTE, captionClass, "captionClass"); @@ -197,34 +240,49 @@ org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component; if(isSortable(column)) { - + boolean enableAsc=false, enableDesc = false, enableUnsort = false; - if(Ordering.ASCENDING.equals(column.getSortOrder())) { + SortOrder sortOrder = column.getSortOrder(); + + if(SortOrder.ASCENDING.equals(sortOrder)) { enableAsc = true; - } else if(Ordering.DESCENDING.equals(column.getSortOrder())){ + } else if(SortOrder.DESCENDING.equals(sortOrder)){ enableDesc = true; } else { enableUnsort = true; } - - encodeSortControls(context, writer, column, enableAsc, enableDesc, enableUnsort); + +// encodeSortControls(context, writer, column, enableAsc, enableDesc, enableUnsort); + + //encode sorting hidden input + /** + writer.startElement(HTML.INPUT_ELEM, column); + writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":sorting", null); + writer.writeAttribute(HTML.NAME_ATTRIBUTE, column.getClientId(context) + ":sorting", null); + writer.writeAttribute(HTML.TYPE_ATTR, "hidden",null); + writer.writeAttribute(HTML.VALUE_ATTRIBUTE, sortOrder, null); + writer.endElement(HTML.INPUT_ELEM); + */ } writer.endElement(HTML.SPAN_ELEM); } public void encodeSortControls(FacesContext context, ResponseWriter writer, org.richfaces.component.UIColumn column, boolean enableAsc, boolean enableDesc, boolean enableUnsort) throws IOException { - + /* String sortIconAsc = column.getSortIconAsc(); String sortIconDesc = column.getSortIconDesc(); String sortIconUnsort = column.getSortIconUnsort(); + String clientId = column.getClientId(context); + //TODO: anton - add styles attribute for sortControls + //encode asc control writer.startElement(HTML.IMG_ELEMENT, column); - writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.ASCENDING, null); + writer.writeAttribute(HTML.ID_ATTRIBUTE, clientId + ":" + Ordering.ASCENDING, null); writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconAsc, null); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); @@ -237,7 +295,7 @@ //encode desc control writer.startElement(HTML.IMG_ELEMENT, column); - writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.DESCENDING, null); + writer.writeAttribute(HTML.ID_ATTRIBUTE, clientId + ":" + Ordering.DESCENDING, null); writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconDesc, null); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); @@ -249,7 +307,7 @@ //encode unsorted control writer.startElement(HTML.IMG_ELEMENT, column); - writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.UNSORTED, null); + writer.writeAttribute(HTML.ID_ATTRIBUTE, clientId + ":" + Ordering.UNSORTED, null); writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconUnsort, null); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); @@ -259,6 +317,7 @@ } writer.endElement(HTML.IMG_ELEMENT); + */ } } @@ -272,7 +331,6 @@ public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent column, String facetName) throws IOException { - } } @@ -282,7 +340,11 @@ } public boolean isSortable(UIColumn column) { - return (column.getAttributes().get("sortBy") != null); + if(column instanceof org.richfaces.component.UIColumn) { + //TODO: anton - add check for the "comparator" property + return ((org.richfaces.component.UIColumn)column).getValueExpression("sortBy") != null; + } + return false; } @Override @@ -296,10 +358,11 @@ HashMap<String, Object> options = new HashMap<String, Object>(); options.put("sortMode", dataTable.getSortMode()); + options.put("sortField", dataTable.getClientId() + ":sort"); + - HashMap<String, Object> columnsOption = new HashMap<String, Object>(); - + /* Iterator<UIComponent> columns = dataTable.columns(); while (columns.hasNext()) { @@ -311,20 +374,96 @@ columnsOption.put(column.getClientId(context), columnOption); HashMap<String, Object> sorting = new HashMap<String, Object>(); - sorting.put("sortOrder", column.getSortOrder()); - sorting.put("sortEvent", column.getSortEvent()); - sorting.put("sortable", isSortable(column)); + boolean sortable = isSortable(column); + if(sortable) { + sorting.put("sortOrder", column.getSortOrder()); + sorting.put("sortEvent", column.getSortEvent()); + } + sorting.put("sortable", sortable); columnOption.put("sorting", sorting); } - - + } options.put("columns", columnsOption); - + */ function.addParameter(options); writer.writeText(function.toScript(), null); writer.endElement(HTML.SCRIPT_ELEM); } + + public String getTableSkinClass() { + return "rich-table"; + } + + public String getCaptionSkinClass() { + return "rich-table-caption"; + } + + @Override + public String getFirstRowSkinClass() { + return "rich-table-first-row"; + } + + @Override + public String getRowSkinClass() { + return "rich-table-row"; + } + + public String getCellSkinClass() { + return "rich-table-cell"; + } + + public String getHeaderSkinClass() { + return "rich-table-header"; + } + + @Override + public String getHeaderFirstSkinClass() { + return "rich-table-header-first"; + } + + public String getHeaderCellSkinClass() { + return "rich-table-header-cell"; + } + + public String getColumnHeaderSkinClass() { + return "rich-table-subheader"; + } + + @Override + public String getColumnHeaderFirstSkinClass() { + return "rich-table-subheader-first"; + } + + public String getColumnHeaderCellSkinClass() { + return "rich-table-subheader-cell"; + } + + public String getColumnFooterSkinClass() { + return "rich-table-subfooter"; + } + + @Override + public String getColumnFooterFirstSkinClass() { + return "rich-table-subfooter-first"; + } + + public String getColumnFooterCellSkinClass() { + return "rich-table-subfooter-cell"; + } + + public String getFooterSkinClass() { + return "rich-table-footer"; + } + + @Override + public String getFooterFirstSkinClass() { + return "rich-table-footer-first"; + } + + public String getFooterCellSkinClass() { + return "rich-table-footer-cell"; + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -180,4 +180,37 @@ writer.writeAttribute(HTML.STYLE_ATTRIBUTE, toEncode.toString(), null); } } + + public abstract String getTableSkinClass(); + + public abstract String getFirstRowSkinClass(); + + public abstract String getRowSkinClass(); + + public abstract String getHeaderCellSkinClass(); + + public abstract String getHeaderSkinClass(); + + public abstract String getHeaderFirstSkinClass(); + + public abstract String getColumnHeaderCellSkinClass(); + + public abstract String getColumnHeaderSkinClass(); + + public abstract String getColumnHeaderFirstSkinClass(); + + public abstract String getFooterCellSkinClass(); + + public abstract String getFooterSkinClass(); + + public abstract String getFooterFirstSkinClass(); + + public abstract String getColumnFooterCellSkinClass(); + + public abstract String getColumnFooterSkinClass(); + + public abstract String getColumnFooterFirstSkinClass(); + + public abstract String getCellSkinClass(); + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -479,4 +479,100 @@ // TODO Auto-generated method stub } + + @Override + public String getCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnFooterSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getColumnHeaderSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFirstRowSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFooterSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderCellSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderFirstSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getHeaderSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRowSkinClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getTableSkinClass() { + // TODO Auto-generated method stub + return null; + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -26,8 +26,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; - +//TODO - anton move to the api public interface HeaderEncodeStrategy { + public abstract void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent column, String facetName) throws IOException; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -22,9 +22,9 @@ encodeHeaderFacet(writer, context, subTable); - String rowClass = subTable.getRowSkinClass(); - String cellClass = subTable.getCellSkinClass(); - String firstClass = subTable.getFirstRowSkinClass(); + String rowClass = getRowSkinClass(); + String cellClass = getCellSkinClass(); + String firstClass = getFirstRowSkinClass(); rowClass = mergeStyleClasses("rowClass", rowClass, subTable); cellClass = mergeStyleClasses("cellClass", cellClass, subTable); @@ -83,4 +83,92 @@ // TODO Auto-generated method stub } + + + @Override + public String getRowSkinClass() { + return "rich-subtable-row"; + } + + @Override + public String getFirstRowSkinClass() { + return "rich-subtable-first-row"; + } + + public String getHeaderRowSkinClass() { + return "rich-subtable-header-row"; + } + + public String getHeaderFirstRowSkinClass() { + return "rich-subtable-header-first"; + } + + public String getCellSkinClass() { + return "rich-subtable-cell"; + } + + public String getHeaderCellSkinClass() { + return "rich-subtable-header-cell"; + } + + + public String getColumnHeaderCellSkinClass() { + return "rich-subtable-subheader-cell"; + } + + public String getColumnHeaderSkinClass() { + return "rich-subtable-subheader"; + } + + public String getFooterCellSkinClass() { + return "rich-subtable-footer-cell"; + } + + public String getFooterSkinClass() { + return "rich-subtable-footer"; + } + + public String getFooterFirstRowSkinClass() { + return "rich-subtable-footer-first"; + } + + public String getColumnFooterCellSkinClass() { + return "rich-subtable-subfooter-cell"; + } + + public String getColumnFooterSkinClass() { + return "rich-subtable-subfooter-cell"; + } + + public String getTableSkinClass() { + return null; + } + + public String getTableHeadSkinClass() { + return null; + } + + @Override + public String getColumnFooterFirstSkinClass() { + return "rich-subtable-subfooter-first"; } + + @Override + public String getColumnHeaderFirstSkinClass() { + return "rich-subtable-subheader-first"; + } + + @Override + public String getFooterFirstSkinClass() { + return "rich-subtable-footer-first"; + } + + @Override + public String getHeaderFirstSkinClass() { + return "rich-subtable-header-first"; + } + + @Override + public String getHeaderSkinClass() { + return "rich-subtable-header"; + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -27,6 +27,7 @@ */ @ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name="richfaces-queue.js"), @ResourceDependency(name = "toggler.js")}) + public abstract class ToggleControlRendererBase extends RendererBase { private static final String MANAGER_SCRIPT = "RichFaces.ui.ToggleManager.addToggler(new RichFaces.ui.Toggle(''{0}'', {1}));"; @@ -197,14 +198,14 @@ public String getScript(UIToggleControl toggleControl, String switchType, boolean isExpanded) { String pattern = null; - + /* if (switchType.equals(UISubTable.SWITCH_TYPE_CLIENT)) { pattern = CLIENT_TOGGLE_SCRIPT; } else if (switchType.equals(UISubTable.SWITCH_TYPE_AJAX)) { pattern = AJAX_TOGGLE_SCRIPT; } else { pattern = SERVER_TOGGLE_SCRIPT; - } + }*/ String toggleId = toggleControl.getClientId(); return MessageFormat.format(pattern, toggleId, isExpanded); Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TogglerBehaviorRenderer.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,72 @@ +package org.richfaces.renderkit; + +import java.util.HashMap; +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.ClientBehavior; +import javax.faces.component.behavior.ClientBehaviorContext; +import javax.faces.context.FacesContext; +import javax.faces.render.ClientBehaviorRenderer; +import javax.faces.render.FacesBehaviorRenderer; +import javax.faces.render.RenderKitFactory; + +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.renderkit.RendererUtils; +import org.richfaces.component.behavior.ToggleBehavior; + +@FacesBehaviorRenderer(rendererType="org.richfaces.behavior.ToggleBehavior", renderKitId=RenderKitFactory.HTML_BASIC_RENDER_KIT) +public class TogglerBehaviorRenderer extends ClientBehaviorRenderer { + + private String SCRIPT_NAME = "RichFaces.Event.callHandlerById"; + + private String SCRIPT_EMPTY = ""; + +// RichFaces.Event.callHandlerById('form1:j_idt6', 'RICH:sort', {state: 'expanded'}); + @Override + public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) { + + String script = SCRIPT_EMPTY; + + if(behavior instanceof ToggleBehavior) { + + ToggleBehavior toggleBehavior = (ToggleBehavior)behavior; + + UIComponent toggleComponent = findComponent(behaviorContext, toggleBehavior.getToggleComponentId()); + UIComponent toggleSource = findComponent(behaviorContext, toggleBehavior.getToggleSource()); + + + String toggleComponentId = toggleComponent.getClientId(behaviorContext.getFacesContext()); + String toggleSourceId = toggleSource.getClientId(behaviorContext.getFacesContext()); + + String toggleEventType = toggleBehavior.getToggleEvent(); + + JSFunction function = new JSFunction(SCRIPT_NAME); + function.addParameter(toggleComponentId); + function.addParameter(toggleEventType); + + Map <String, Object> data = new HashMap<String, Object>(); + function.addParameter(data); + data.put("source", toggleSourceId); + + function.appendScript(new StringBuffer()); + script = function.toScript(); + } + + return script; + } + + private UIComponent findComponent(ClientBehaviorContext behaviorContext, String id) { + UIComponent component = behaviorContext.getComponent(); + //TODO: anton - check id == null!!! + //TODO: anton - should found component implement marker interface e.g. ToggleAble ??? + return RendererUtils.getInstance().findComponentFor(component, id); + } + + @Override + public void decode(FacesContext context, UIComponent component, ClientBehavior behavior) { + super.decode(context, component, behavior); + } + + +} Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2010-02-19 16:45:49 UTC (rev 16472) @@ -0,0 +1,58 @@ +package org.richfaces.taglib; + +import javax.el.MethodExpression; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.MetaRuleset; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; + +import org.richfaces.component.UIDataTable; + +public class DataTableHandler extends ComponentHandler { + + private static final DataTableHandlerMetaRule METARULE = new DataTableHandlerMetaRule(); + + public DataTableHandler(ComponentConfig config) { + super(config); + } + + @Override + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(METARULE); + return m; + } + + static class DataTableHandlerMetaRule extends MetaRule { + + @Override + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if (meta.isTargetInstanceOf(UIDataTable.class) && "sortingListener".equals(name)) { + return new DataTableMapper(attribute); + } + return null; + } + + } + + static class DataTableMapper extends Metadata { + + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.SortingEvent.class }; + + private final TagAttribute attribute; + + public DataTableMapper(TagAttribute attribute) { + this.attribute = attribute; + } + + @Override + public void applyMetadata(FaceletContext ctx, Object instance) { + MethodExpression methodExpression = attribute.getMethodExpression(ctx, null, SIGNATURE); + ((UIDataTable) instance).setSortingListener(methodExpression); + } + } +} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-02-19 16:45:49 UTC (rev 16472) @@ -9,16 +9,24 @@ this.initializeColumns(options.columns); }; + jQuery.extend(richfaces.ui.DataTable, { + ASCENDING :'ASCENDING', + DESCENDING : 'DESCENDING', + UNSORTED : 'UNSORTED', + SINGLE: 'single', + MULTI: 'multi' + }); + jQuery.extend(richfaces.ui.DataTable.prototype, ( function () { var columns = {}; - + var convertId = function (id){ return id.replace(/:/g, "\\:"); }; var getElement = function (id) { - return $("#" + convertId(id)); + return jQuery("#" + convertId(id)); }; return { @@ -42,7 +50,7 @@ var column = e.data; column.toggleSortControl(e); - if(this.sortMode == 'single') { + if(this.sortMode == richfaces.ui.DataTable.SINGLE) { for(var x in columns) { if(columns[x].id != column.id) { columns[x].resetSortControl(); @@ -64,8 +72,11 @@ richfaces.ui.Column = function(id, options) { this.id = id; this.sortable = options.sorting.sortable; - this.sortOrder = options.sorting.sortOrder; - this.sortEvent = options.sorting.sortEvent; + //TODO: anton move to another place??? + if(this.sortable) { + this.sortOrder = options.sorting.sortOrder; + this.sortEvent = options.sorting.sortEvent; + } this.initializeControls(id); }; @@ -76,9 +87,14 @@ }; var getElement = function (id) { - return $("#" + convertId(id)); - }; + return jQuery("#" + convertId(id)); + }; + var saveOrder = function(newOrder) { + var input = getElement(this.id + ":sorting"); + input.attr("value",newOrder); + }; + return { initializeControls: function(id) { this.asc = getElement(id+':ASCENDING'); @@ -88,30 +104,33 @@ toggleSortControl: function(e) { - if(this.sortOrder == "ASCENDING") { + if(this.sortOrder == richfaces.ui.DataTable.ASCENDING) { this.asc.hide(); this.unsort.hide(); this.desc.show(); - this.sortOrder = "DESCENDING"; + this.sortOrder = richfaces.ui.DataTable.DESCENDING; - } else if(this.sortOrder == "DESCENDING") { + } else if(this.sortOrder == richfaces.ui.DataTable.DESCENDING) { this.asc.show(); this.unsort.hide(); this.desc.hide(); - this.sortOrder = "ASCENDING"; + this.sortOrder = richfaces.ui.DataTable.ASCENDING; - } else if(this.sortOrder == "UNSORTED") { + } else if(this.sortOrder == richfaces.ui.DataTable.UNSORTED) { this.asc.hide(); this.unsort.hide(); this.desc.show(); - this.sortOrder = "DESCENDING"; + this.sortOrder = richfaces.ui.DataTable.DESCENDING; } + + saveOrder.call(this, this.sortOrder); }, resetSortControl: function(){ this.asc.hide(); this.desc.hide(); this.unsort.show(); + saveOrder.call(this, richfaces.ui.DataTable.UNSORTED); } } })()); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2010-02-19 11:03:52 UTC (rev 16471) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2010-02-19 16:45:49 UTC (rev 16472) @@ -76,8 +76,7 @@ return { getElement : function (id) { - // TODO: use jQuery instead of $ - return $("#" + convertId(id)); + return jQuery("#" + convertId(id)); }, saveState : function(state) {

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16471 - in branches/community/3.3.X: framework/impl and 1 other directories.

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

Author: nbelaevski Date: 2010-02-19 06:03:52 -0500 (Fri, 19 Feb 2010) New Revision: 16471 Modified: branches/community/3.3.X/framework/api/pom.xml branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/ui/assembly/pom.xml Log: Reverted changes in pom.xml for r16469 Modified: branches/community/3.3.X/framework/api/pom.xml =================================================================== --- branches/community/3.3.X/framework/api/pom.xml 2010-02-19 04:09:04 UTC (rev 16470) +++ branches/community/3.3.X/framework/api/pom.xml 2010-02-19 11:03:52 UTC (rev 16471) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> <dependencies> <dependency> @@ -39,4 +39,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> +</project> \ No newline at end of file Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-02-19 04:09:04 UTC (rev 16470) +++ branches/community/3.3.X/framework/impl/pom.xml 2010-02-19 11:03:52 UTC (rev 16471) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>${classifiedArtifactId}</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> <build> <resources> <resource> @@ -249,7 +249,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </dependency> </dependencies> -</project> +</project> \ No newline at end of file Modified: branches/community/3.3.X/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2010-02-19 04:09:04 UTC (rev 16470) +++ branches/community/3.3.X/ui/assembly/pom.xml 2010-02-19 11:03:52 UTC (rev 16471) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -435,20 +435,20 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-jsf2</artifactId> - <version>3.3.3.CR1</version> + <version>3.3.3-SNAPSHOT</version> </dependency> </dependencies> </profile> </profiles> <dependencies /> -</project> +</project> \ No newline at end of file

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16470 - branches/community/3.3.X/docs.

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

Author: SeanRogers Date: 2010-02-18 23:09:04 -0500 (Thu, 18 Feb 2010) New Revision: 16470 Added: branches/community/3.3.X/docs/3.3.1_tlddoc_update.zip Log: Added package to upload for correction to 3.3.1 docs Added: branches/community/3.3.X/docs/3.3.1_tlddoc_update.zip =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/3.3.1_tlddoc_update.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16469 - in branches/community/3.3.X: framework/api and 2 other directories.

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

Author: SeanRogers Date: 2010-02-18 22:21:02 -0500 (Thu, 18 Feb 2010) New Revision: 16469 Added: branches/community/3.3.X/docs/RichFaces_3.3.3.CR1_docs_update.zip Modified: branches/community/3.3.X/framework/api/pom.xml branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/ui/assembly/pom.xml Log: Updated versions for javadocs, added zip of updates for uploading to docs site. Added: branches/community/3.3.X/docs/RichFaces_3.3.3.CR1_docs_update.zip =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/RichFaces_3.3.3.CR1_docs_update.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/community/3.3.X/framework/api/pom.xml =================================================================== --- branches/community/3.3.X/framework/api/pom.xml 2010-02-18 23:48:59 UTC (rev 16468) +++ branches/community/3.3.X/framework/api/pom.xml 2010-02-19 03:21:02 UTC (rev 16469) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> <dependencies> <dependency> @@ -39,4 +39,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-02-18 23:48:59 UTC (rev 16468) +++ branches/community/3.3.X/framework/impl/pom.xml 2010-02-19 03:21:02 UTC (rev 16469) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>${classifiedArtifactId}</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> <build> <resources> <resource> @@ -249,7 +249,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2010-02-18 23:48:59 UTC (rev 16468) +++ branches/community/3.3.X/ui/assembly/pom.xml 2010-02-19 03:21:02 UTC (rev 16469) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -435,20 +435,20 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-jsf2</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.CR1</version> </dependency> </dependencies> </profile> </profiles> <dependencies /> -</project> \ No newline at end of file +</project>

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16468 - in root/cdk/trunk/plugins/generator/src/main: java/org/richfaces/cdk/parser/el/node and 3 other directories.

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

Author: nbelaevski Date: 2010-02-18 18:48:59 -0500 (Thu, 18 Feb 2010) New Revision: 16468 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd Log: TODOs & fixes for CDK Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -60,6 +60,7 @@ public static final String RIGHT_BRACKET = ")"; public static final String RIGHT_SQUARE_BRACKET = "]"; public static final String THIS_PREFIX = "this"; + public static final String SUPER_PREFIX = "super"; public static final String GETTER_PREFIX = "get"; public static final String IS_EMPTY_FUNCTION = "isEmpty"; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; import java.util.Map; @@ -35,12 +33,12 @@ /** * This class extend AbstractTreeNode and wrap AstFunction node. - * + * * @author amarkhel - * + * */ public class AstFunctionTreeNode extends AbstractMethodTreeNode { - + public AstFunctionTreeNode(Node node) { super(node); } @@ -53,14 +51,14 @@ String identifierName; if (!Strings.isEmpty(functionPrefix)) { - //TODO: this should be a property getter, not property name. NB: 'this' & 'super' keywords + // TODO: this should be a property getter, not property name. NB: 'this' & 'super' keywords identifierName = functionPrefix; } else { identifierName = ELNodeConstants.THIS_PREFIX; } sb.append(identifierName); - + Type identifierType = getIdentifierFromContext(context, identifierName); visitor.setVariableType(identifierType); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -36,6 +36,8 @@ */ public class MethodBodyTemplateModel extends BeanModel implements TemplateModel { + private static final String CODE_ATTRIBUTE_NAME = "code"; + private final MethodBodyStatement statement; private final JavaClassModelWrapper modelWrapper; @@ -53,9 +55,9 @@ @Override public TemplateModel get(String key) throws TemplateModelException { - if ("code".equals(key)) { - //TODO - ? - return modelWrapper.wrap(statement.getCode(modelWrapper.getConfiguration())); + if (CODE_ATTRIBUTE_NAME.equals(key)) { + String statementCode = statement.getCode(modelWrapper.getConfiguration()); + return modelWrapper.wrap(statementCode); } return super.get(key); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -95,6 +95,11 @@ public class RendererClassVisitor implements TemplateVisitor { /** + * + */ + // TODO externalize + static final String RENDER_KIT_UTILS_CLASS_NAME = "org.richfaces.renderkit.RenderKitUtils"; + /** * */ static final String RESPONSE_WRITER_VARIABLE = "responseWriter"; @@ -273,8 +278,7 @@ return parsedExpression + "/* " + expression.trim() + " */"; } catch (ParsingException e) { // TODO Auto-generated catch block - e.printStackTrace(); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } @@ -375,7 +379,7 @@ passThroughField.addModifier(JavaModifier.FINAL); generatedClass.addImport("org.richfaces.renderkit.ComponentAttribute"); - generatedClass.addImport("org.richfaces.renderkit.RenderKitUtils"); + generatedClass.addImport(RENDER_KIT_UTILS_CLASS_NAME); generatedClass.addImport(Collections.class); // TODO - get rid of FQNs for classes via imports @@ -541,8 +545,7 @@ } else { String attributeLocalName = attributeName.getLocalPart(); if (writtenAttributes.add(attributeLocalName)) { - // TODO externalize - generatedClass.addImport("org.richfaces.renderkit.RenderKitUtils"); + generatedClass.addImport(RENDER_KIT_UTILS_CLASS_NAME); currentStatement.addStatement(new WriteAttributeStatement(attributeLocalName, compileEl( attributeValue.toString(), String.class))); } @@ -569,8 +572,7 @@ if (!actualAttributesMap.isEmpty()) { JavaField passThroughField = createPassThroughField(actualAttributesMap); generatedClass.addField(passThroughField); - // TODO externalize - generatedClass.addImport("org.richfaces.renderkit.RenderKitUtils"); + generatedClass.addImport(RENDER_KIT_UTILS_CLASS_NAME); currentStatement.addStatement(new WriteAttributesSetStatement(passThroughField.getName())); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -238,7 +238,6 @@ * * @return the type */ - //TODO: add handling public String getType() { return type; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-02-18 23:48:59 UTC (rev 16468) @@ -34,7 +34,6 @@ * @author asmirnov(a)exadel.com */ @XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE) -//TODO add support for attribute files imports public class Template implements Serializable { public static final String JSTL_CORE_NAMESPACE = "http://richfaces.org/cdk/jstl/core"; Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-02-18 23:48:59 UTC (rev 16468) @@ -31,7 +31,7 @@ </xs:annotation> <xs:attributeGroup name="beanDescriptorAttributes"> - <xs:attribute name="displayName"> + <xs:attribute name="displayName" type="xs:string"> <xs:annotation> <xs:documentation> <p> @@ -66,7 +66,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="shortDescription"> + <xs:attribute name="shortDescription" type="xs:string"> <xs:annotation> <xs:documentation> <p> @@ -83,7 +83,7 @@ <xs:complexType name="attributeExtensionType"> <xs:group ref="cc:compositeTagsGroup" /> - <xs:attribute name="name" use="required"> + <xs:attribute name="name" use="required" type="xs:string"> <xs:annotation> <xs:documentation> <p> @@ -106,7 +106,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="targets"> + <xs:attribute name="targets" type="xs:NMTOKENS"> <xs:annotation> <xs:documentation> <p> @@ -131,7 +131,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="default"> + <xs:attribute name="default" type="xs:string"> <xs:annotation> <xs:documentation> <p> @@ -153,7 +153,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="method-signature"> + <xs:attribute name="method-signature" type="xs:string"> <xs:annotation> <xs:documentation> Declares that this attribute must be a @@ -212,7 +212,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="type"> + <xs:attribute name="type" type="xs:string"> <xs:annotation> <xs:documentation> <p> @@ -230,7 +230,7 @@ </xs:complexType> <xs:complexType name="clientBehaviorExtensionType"> - <xs:attribute name="event"> + <xs:attribute name="event" type="xs:string"> <xs:annotation> <xs:documentation> <p> Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-02-18 11:26:25 UTC (rev 16467) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-02-18 23:48:59 UTC (rev 16468) @@ -78,12 +78,12 @@ </xs:complexType> <xs:complexType name="resourceDependencyType"> - <xs:attribute name="name" use="required" form="unqualified"> + <xs:attribute name="name" use="required" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation><p>The resourceName of the resource pointed to by this ResourceDependency.</p></xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="library" form="unqualified"> + <xs:attribute name="library" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation> <p>The libraryName in which the resource pointed to by this ResourceDependency resides. @@ -388,7 +388,7 @@ </xs:documentation> </xs:annotation> <xs:complexType mixed="true"> - <xs:attribute name="expression" form="unqualified"> + <xs:attribute name="expression" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation> <p>Method invocation expression. If this attribute is ommitted, body of the tag is used instead.</p> @@ -438,7 +438,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="value" form="unqualified"> + <xs:attribute name="value" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation> <p>EL-expression specifying initial value of the variable. If this attribute @@ -455,7 +455,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="type" form="unqualified"> + <xs:attribute name="type" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation> <p>Variable type name. CDK automatically resolves simple names for primitive types, @@ -473,7 +473,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="type-arguments" form="unqualified"> + <xs:attribute name="type-arguments" form="unqualified" type="xs:string"> <xs:annotation> <xs:documentation> <p>Comma-separated list of generic type arguments for usage with types like

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16467 - in branches/enterprise/3.3.1.SP1_RFPL-394: cdk and 217 other directories.

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

Author: konstantin.mishin Date: 2010-02-18 06:26:25 -0500 (Thu, 18 Feb 2010) New Revision: 16467 Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/generator/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-cdk-plugin/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-javascript-plugin/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-resource-dependency-plugin/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/cdk/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/devsample.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/setup.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/highlight/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/migrationguide/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/migrationguide/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/photo_album_app_guide/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/photo_album_app_guide/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/assembly/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ear/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ejb/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/web/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/tests/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/extensions/gwt/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/extensions/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/extensions/seam/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/extensions/trinidad/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/framework/api/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/src/main/java/org/richfaces/VersionBean.java branches/enterprise/3.3.1.SP1_RFPL-394/framework/jsf-test/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/framework/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/framework/test/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/beanValidatorSample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/calendar-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/colorPickerDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/columnsDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/combobox-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/contextMenuDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/createProject.sh branches/enterprise/3.3.1.SP1_RFPL-394/samples/darkX/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataFilterSliderDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataTableDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/datascroller-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/dragDropDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/dropdownmenu-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/editor-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/editorSeam-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/effect-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/extendedDataTable-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/fileUploadDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/functions-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/glassX/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/gmap-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/hotKey-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceInput-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceSelect-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSliderDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSpinnerDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/jQuery-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/jira-data/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/laguna/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/layout-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/listShuttleDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/local-value-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/modalpanel-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/orderingListDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/panel-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelbar-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelmenu-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/pickList-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/progressBarDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/queue-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/rich-message-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-art-datatable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/ejb/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/richfacesEAR/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/webapp/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/scrollableDataTableDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ear/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ejbs/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/primary-source/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/logging/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/seamWebapp/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamIntegration/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/separator-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/simpleTogglePanel-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/skins/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/sortingFilteringDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/state-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/stdcomponents-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/suggestionbox-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/tabPanelDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/themes/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/togglePanel-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/tomahawkCompability/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/toolBarDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/tooltip-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/tree-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/treeModelDemo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/violetRays/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/samples/virtualEarth-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/api/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/cdk/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/impl/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/dialog-window-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/editorOld-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/fileUploadPOC/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/maven-rd-plugin-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/panel2-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/rex-demo/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/simpleTogglePanel2-sample/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.bat branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.sh branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/dialog-window/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/editorOld/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/panel2/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-button/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-messageBox/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-resizable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/simpleTogglePanel2/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/sortableHeader/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/treeTable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/ajaxTest/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/automator/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/facelets/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/jsp/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ear/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ejb/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-tests/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-web/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/web/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seamApp/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/richfaces/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/samples/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/assembly/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/beanValidator/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/calendar/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/colorPicker/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/columns/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/combobox/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/componentControl/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/contextMenu/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/core/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/create.bat branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataFilterSlider/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataTable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/datascroller/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/drag-drop/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/dropdown-menu/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/editor/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/effect/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/extendedDataTable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/fileUpload/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/functions/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/gmap/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/hotKey/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceInput/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceSelect/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-slider/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-spinner/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/insert/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/jQuery/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/layout/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/listShuttle/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/menu-components/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/message/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/modal-panel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/orderingList/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/paint2D/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/panel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelbar/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelmenu/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/pickList/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/progressBAR/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/separator/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/simpleTogglePanel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/spacer/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/state/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/suggestionbox/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/tabPanel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/togglePanel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/toolBar/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/tooltip/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/tree/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeModel/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeTable/pom.xml branches/enterprise/3.3.1.SP1_RFPL-394/ui/virtualEarth/pom.xml Log: RFPL-394 Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/generator/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/generator/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/generator/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Java Server Faces component generator</name> <build> <plugins> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -11,7 +11,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <configuration> <library> <prefix>${groupId}</prefix> @@ -41,7 +41,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -30,7 +30,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-plug-n-skin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Archetype - maven-archetype-plug-n-skin</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -34,7 +34,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-seam-app</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Archetype - maven-archetype-seam-app</name> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>${artifactId}</projectName> - <richfacesVersion>3.3.1.SP1</richfacesVersion> + <richfacesVersion>3.3.1.SP1_RFPL-394</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.3.GA/jboss-4.2.3.GA/server/default/</jbossDeployDir> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-theme</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>maven-archetype</packaging> <name>maven-archetype-theme</name> <build> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -41,12 +41,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency>  Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-cdk-plugin/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-cdk-plugin/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> <build> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-javascript-plugin/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-javascript-plugin/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-javascript-plugin/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-resource-dependency-plugin/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-resource-dependency-plugin/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/maven-resource-dependency-plugin/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -12,7 +12,7 @@ <artifactId>maven-resource-dependency-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>maven-resource-dependency-plugin</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/cdk/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/cdk/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/cdk/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.cdkguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>jar</packaging> <name>Richfaces CDK Developer Guide (${translation})</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -14,7 +14,7 @@ At first we need to create a project for the component itself. In the library directory <property>Sandbox</property> you just created, launch the following command (all in one line): </para> - <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1 -DartifactId=inputDate]]> + <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DartifactId=inputDate]]> </programlisting> <para> As is easy to see a new directory with the name <property>inputDate</property> will be created. @@ -164,7 +164,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -202,7 +202,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project>]]> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/devsample.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/devsample.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/devsample.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -21,7 +21,7 @@ where you have created the <emphasis role="bold"><property><inputDate></property></emphasis> component and launch the following command (all in one line): </para> - <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1.SP1 -DgroupId=org.mycompany -DartifactId=inputDate-sample]]></programlisting> + <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DgroupId=org.mycompany -DartifactId=inputDate-sample]]></programlisting> <para> As easy to see a new directory <property>inputDate-sample</property> is created with the predefined JSF project structure: </para> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/setup.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -180,7 +180,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project>]]> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/cdkguide/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>cdkguide</name> <description>Richfaces CDK Developer Guide</description> <pluginRepositories> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>common-resources</artifactId> <groupId>org.richfaces.docs</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.common-resources</groupId> <artifactId>en</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>jar</packaging> <name>Documentation common resources (en)</name> <description> @@ -17,7 +17,7 @@ <dependency> <groupId>org.richfaces.docs</groupId> <artifactId>highlight</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> <build> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <artifactId>richfacesguide-archetype</artifactId> <packaging>maven-archetype</packaging> <name>richfacesguide-archetype</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <extensions> <extension> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.richfacesguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>jar</packaging> <name>Richfaces Guide Template</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>richfacesguide</name> <description>Richfaces Guide Template</description> <pluginRepositories> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/common-resources/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>common-resources</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>pom</packaging> <name>Documentation common resources</name> <description>Common resources</description> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/en/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/en/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/en/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.faq</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/faq/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>FAQ</name> <description>Frequently asked questions</description>  Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -327,7 +327,7 @@ <para>Now you have everything to create the project using the "maven-archetype-jsfwebapp" archetype. Create a folder that will house your project and run the this command in it:</para> <programlisting role="XML" ><![CDATA[... -mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1.SP1 -DgroupId=org.docs.richfaces -DartifactId=jsf-app +mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DgroupId=org.docs.richfaces -DartifactId=jsf-app ...]]></programlisting> @@ -453,17 +453,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> ...]]></programlisting> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3238,7 +3238,7 @@ <listitem> <para> <code>archetypeVersion</code> indicates the RichFaces version. For example, - <code>"3.3.1.SP1"</code> + <code>"3.3.1.SP1_RFPL-394"</code> </para> </listitem> <listitem> @@ -3482,7 +3482,7 @@ mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin --DarchetypeVersion=3.3.1.SP1 +-DarchetypeVersion=3.3.1.SP1_RFPL-394 -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT Modified: branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/docs/userguide/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/assembly/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/assembly/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/assembly/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Photoalbum Demo Application Root</name> <modules> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ear/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ear/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ear/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ejb/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/ejb/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -8,7 +8,7 @@ <artifactId>photoalbum</artifactId> <packaging>pom</packaging> <name>${appName}</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <distributionManagement> <downloadUrl> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/web/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/source/web/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/tests/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/tests/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/examples/photoalbum/tests/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/extensions/gwt/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/extensions/gwt/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/extensions/gwt/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/extensions/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/extensions/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/extensions/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>extensions</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Richfaces extensions for a different environments</name> <packaging>pom</packaging> <modules> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/extensions/seam/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/extensions/seam/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/extensions/seam/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/extensions/trinidad/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/extensions/trinidad/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/extensions/trinidad/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/api/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/api/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/api/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <dependencies> <dependency> <groupId>commons-collections</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <resources> <resource> @@ -161,7 +161,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/src/main/java/org/richfaces/VersionBean.java 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/impl/src/main/java/org/richfaces/VersionBean.java 2010-02-18 11:26:25 UTC (rev 16467) @@ -38,7 +38,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = "1.SP1" ; + public static final String REVISION = "1.SP1_RFPL-394" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version(); Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/jsf-test/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/jsf-test/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/jsf-test/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,13 +4,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <dependencies> <dependency> <groupId>junit</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <build> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/framework/test/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/framework/test/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/framework/test/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> <dependencies> @@ -42,7 +42,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <artifactId>root</artifactId> <packaging>pom</packaging> <name>Jboss RichFaces project</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/beanValidatorSample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/beanValidatorSample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/beanValidatorSample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,14 +3,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>beanValidatorSample</artifactId> <packaging>war</packaging> <name>beanValidatorSample Maven Webapp</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <finalName>richfaces-validator</finalName> <plugins> @@ -52,7 +52,7 @@  <dependency> <groupId>org.hibernate</groupId> @@ -75,7 +75,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>com.uwyn</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/calendar-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/calendar-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/calendar-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/colorPickerDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/colorPickerDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/colorPickerDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -35,7 +35,7 @@ <groupId>org.richfaces.framework </groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples @@ -46,17 +46,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>colorPicker</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/columnsDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/columnsDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/columnsDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/combobox-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/combobox-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/combobox-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/contextMenuDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/contextMenuDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/contextMenuDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/createProject.sh =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/createProject.sh 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/createProject.sh 2010-02-18 11:26:25 UTC (rev 16467) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ - -DarchetypeVersion=3.3.1.SP1 -Dversion=3.3.1.SP1 -DgroupId=org.richfaces.samples -DartifactId=$1 + -DarchetypeVersion=3.3.1.SP1_RFPL-394 -Dversion=3.3.1.SP1_RFPL-394 -DgroupId=org.richfaces.samples -DartifactId=$1 Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/darkX/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/darkX/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/darkX/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -36,7 +36,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataFilterSliderDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataFilterSliderDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataFilterSliderDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataTableDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataTableDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/dataTableDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/datascroller-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/datascroller-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/datascroller-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/dragDropDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/dragDropDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/dragDropDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/dropdownmenu-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/dropdownmenu-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/editor-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/editor-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/editor-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/editorSeam-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/editorSeam-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/editorSeam-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/effect-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/effect-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/effect-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/extendedDataTable-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/extendedDataTable-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/extendedDataTable-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/fileUploadDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/fileUploadDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/fileUploadDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/functions-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/functions-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/functions-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/glassX/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/glassX/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/glassX/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> <name>glassX</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>junit</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/gmap-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/gmap-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/gmap-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/hotKey-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/hotKey-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/hotKey-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceInput-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceInput-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceInput-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceSelect-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceSelect-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/inplaceSelect-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSliderDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSliderDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSliderDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSpinnerDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/inputNumberSpinnerDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/jQuery-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/jQuery-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/jQuery-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/jira-data/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/jira-data/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/jira-data/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/laguna/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/laguna/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/laguna/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <configuration> <name>org.richfaces.laguna</name> </configuration> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/layout-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/layout-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/layout-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>layout-sample</artifactId> <packaging>war</packaging> <name>layout Maven Webapp</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <finalName>layout-sample</finalName> <plugins> @@ -34,22 +34,22 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <exclusions> <exclusion> <groupId>org.richfaces.ui</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/listShuttleDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/listShuttleDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/listShuttleDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/local-value-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/local-value-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/local-value-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/modalpanel-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/modalpanel-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/modalpanel-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/orderingListDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/orderingListDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/orderingListDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/panel-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/panel-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/panel-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelbar-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelbar-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelbar-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelmenu-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelmenu-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/panelmenu-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/pickList-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/pickList-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/pickList-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/progressBarDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/progressBarDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/progressBarDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/queue-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/queue-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/queue-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>queue-sample</artifactId> <packaging>war</packaging> <name>queue-sample Maven Webapp</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <finalName>queue-sample</finalName> <plugins> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/rich-message-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/rich-message-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/rich-message-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-art-datatable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-art-datatable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-art-datatable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -209,22 +209,22 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>laguna</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>darkX</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -314,12 +314,12 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.persistence</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/ejb/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/ejb/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/webapp/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/richfaces-ear-demo/webapp/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/scrollableDataTableDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/scrollableDataTableDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/scrollableDataTableDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>scrollableDataTableDemo</artifactId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ear/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ear/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ear/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <dependencies> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ejbs/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ejbs/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/ejbs/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <dependencies> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -95,7 +95,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/primary-source/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/primary-source/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/primary-source/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <dependencies> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/logging/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/logging/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/logging/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,6 +7,6 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>projects</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> </project> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/projects/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modules> <module>logging</module> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modules> <module>seamWebapp</module> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/seamWebapp/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamEAR/wars/seamWebapp/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>wars</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <build> <finalName>seamWebapp</finalName> @@ -22,17 +22,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamIntegration/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamIntegration/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/seamIntegration/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/separator-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/separator-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/separator-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/simpleTogglePanel-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/simpleTogglePanel-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/skins/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/skins/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/skins/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/sortingFilteringDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/sortingFilteringDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/sortingFilteringDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@  <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/state-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/state-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/state-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>state</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/stdcomponents-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/stdcomponents-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/stdcomponents-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/suggestionbox-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/suggestionbox-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/suggestionbox-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/tabPanelDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/tabPanelDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/tabPanelDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/themes/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/themes/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/themes/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>themes</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -38,7 +38,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/togglePanel-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/togglePanel-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/togglePanel-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/tomahawkCompability/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/tomahawkCompability/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/tomahawkCompability/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/toolBarDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/toolBarDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/toolBarDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/tooltip-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/tooltip-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/tooltip-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/tree-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/tree-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/tree-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/treeModelDemo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/treeModelDemo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/treeModelDemo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/violetRays/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/violetRays/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/violetRays/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>violetRays</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -38,7 +38,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/samples/virtualEarth-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/samples/virtualEarth-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/samples/virtualEarth-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/api/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/api/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/api/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,13 +2,13 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> @@ -25,12 +25,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/cdk/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/cdk/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/cdk/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>cdk</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/impl/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/impl/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/impl/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,28 +2,28 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> <name>Richfaces Sandbox Implementation</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <dependencies> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/dialog-window-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/dialog-window-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/editorOld-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/editorOld-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/editorOld-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/fileUploadPOC/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/fileUploadPOC/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/fileUploadPOC/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/maven-rd-plugin-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/maven-rd-plugin-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/maven-rd-plugin-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk.sandbox</groupId> <artifactId>maven-rd-plugin-sample</artifactId> <packaging>war</packaging> <name>maven-rd-plugin-sample Maven Webapp</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <pluginRepositories> <pluginRepository> @@ -33,7 +33,7 @@ <plugin> <artifactId>maven-resource-dependency-plugin</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <configuration> <scriptFilePath>scripts/custom-dependencies.js</scriptFilePath> <styleFilePath>css/custom-dependencies.xcss</styleFilePath> @@ -59,7 +59,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/panel2-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/panel2-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/panel2-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/rex-demo/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/rex-demo/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/rex-demo/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -178,7 +178,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -193,28 +193,28 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-resizable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-button</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-messageBox</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.bat =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.bat 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.bat 2010-02-18 11:26:25 UTC (rev 16467) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1 -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.sh =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.sh 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/create.sh 2010-02-18 11:26:25 UTC (rev 16467) @@ -1,2 +1,2 @@ #!/bin/sh -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1 -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/dialog-window/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/dialog-window/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/dialog-window/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -39,12 +39,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/editorOld/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/editorOld/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/editorOld/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/panel2/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/panel2/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/panel2/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,7 +3,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-button/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-button/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-button/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-messageBox/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-messageBox/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-messageBox/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-resizable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-resizable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/rex-resizable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/simpleTogglePanel2/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/simpleTogglePanel2/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/sortableHeader/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/sortableHeader/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/sortableHeader/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>sortableHeader</artifactId> <name>sortableHeader</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -52,17 +52,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/treeTable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/treeTable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/sandbox/ui/treeTable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/ajaxTest/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/ajaxTest/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/ajaxTest/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.el</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/automator/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/automator/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/automator/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/facelets/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/facelets/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/facelets/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/jsp/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/jsp/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/jsp/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <relativePath>../samples</relativePath> </parent> @@ -50,11 +50,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.3.1.SP1</rfVersion> + <rfVersion>3.3.1.SP1_RFPL-394</rfVersion> </properties> <modules> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,12 +4,12 @@  <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> <packaging>pom</packaging> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Regresion Area:Seam Application</name> <repositories> <repository> @@ -60,7 +60,7 @@ <properties> <contextroot>regressionArea</contextroot> <earname>regressionArea-ear</earname> - <richversion>3.3.1.SP1</richversion> + <richversion>3.3.1.SP1_RFPL-394</richversion> <seamversion>2.1.1.GA</seamversion> <jsfversion>1.2_11</jsfversion> <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ear/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ear/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ear</artifactId> <name>Regression Area Ear Module</name> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-tests/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-tests/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>regressionArea</artifactId> <groupId>org.richfaces.test-applications</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.test-applications.regressionArea</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-web/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/regressionArea/regressionArea-web/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-web</artifactId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -8,7 +8,7 @@ <name>richfaces-docs</name> <properties> <projectName>richfaces-docs</projectName> - <richfacesVersion>3.3.1.SP1</richfacesVersion> + <richfacesVersion>3.3.1.SP1_RFPL-394</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <droolsVersion>4.0.0</droolsVersion> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/web/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/web/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/richfaces-docs/web/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -47,7 +47,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>provided</scope> </dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seamApp/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seamApp/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seamApp/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>seamApp</projectName> - <rfVersion>3.3.1.SP1</rfVersion> + <rfVersion>3.3.1.SP1_RFPL-394</rfVersion> <seamVersion>2.1.0.SP1</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,14 +5,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> <packaging>pom</packaging> <name>SeleniumTest</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <url>http://maven.apache.org</url> <properties> <http.port>8085</http.port> @@ -227,7 +227,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/richfaces/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/richfaces/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/richfaces/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,14 +5,14 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>richfaces</artifactId> <packaging>war</packaging> <name>seleniumTest Maven Webapp</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <finalName>richfaces</finalName> </build> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/samples/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/samples/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/test-applications/seleniumTest/samples/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -5,13 +5,13 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>samples</artifactId> <name>Samples</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <finalName>seleniumTest</finalName> <plugins> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/assembly/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/assembly/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/assembly/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <configuration> <library> <prefix>org.richfaces</prefix> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/beanValidator/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/beanValidator/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/beanValidator/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -3,19 +3,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>beanValidator</artifactId> <name>beanValidator</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.hibernate</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/calendar/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/calendar/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/calendar/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -45,13 +45,13 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/colorPicker/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/colorPicker/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/colorPicker/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -12,7 +12,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/columns/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/columns/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/columns/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/combobox/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/combobox/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/combobox/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> <name>combobox</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/componentControl/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/componentControl/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/componentControl/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/contextMenu/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/contextMenu/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/contextMenu/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/core/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/core/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/core/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/create.bat =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/create.bat 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/create.bat 2010-02-18 11:26:25 UTC (rev 16467) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1 -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.SP1_RFPL-394 -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataFilterSlider/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataFilterSlider/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataFilterSlider/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataTable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataTable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/dataTable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> --> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/datascroller/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/datascroller/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/datascroller/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/drag-drop/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/drag-drop/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/drag-drop/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> --> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/dropdown-menu/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/dropdown-menu/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/dropdown-menu/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,12 +44,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/editor/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/editor/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/editor/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -62,7 +62,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>antlr</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/effect/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/effect/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/effect/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/extendedDataTable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/extendedDataTable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/extendedDataTable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -64,45 +64,45 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/fileUpload/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/fileUpload/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/fileUpload/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>fileUpload</artifactId> <name>fileUpload</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/functions/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/functions/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/functions/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/gmap/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/gmap/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/gmap/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/hotKey/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/hotKey/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/hotKey/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -50,7 +50,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceInput/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceInput/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceInput/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> <name>inplaceInput</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,17 +51,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceSelect/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceSelect/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/inplaceSelect/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceSelect</artifactId> <name>inplaceSelect</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,22 +51,22 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-slider/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-slider/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-slider/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-spinner/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/inputnumber-spinner/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/insert/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/insert/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/insert/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/jQuery/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/jQuery/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/jQuery/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/layout/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/layout/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/layout/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -4,18 +4,18 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>layout</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>layout</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -48,7 +48,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/listShuttle/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/listShuttle/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/listShuttle/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/menu-components/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/menu-components/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/menu-components/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/message/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/message/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/message/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <name>Message</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/modal-panel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/modal-panel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/modal-panel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/orderingList/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/orderingList/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/orderingList/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/paint2D/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/paint2D/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/paint2D/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/panel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/panel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/panel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelbar/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelbar/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelbar/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelmenu/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelmenu/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/panelmenu/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/pickList/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/pickList/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/pickList/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>pickList</artifactId> <name>pickList</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -53,26 +53,26 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>listShuttle</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -138,12 +138,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <scope>test</scope> </dependency> <dependency> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/progressBAR/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/progressBAR/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/progressBAR/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> <name>progressBar</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -70,17 +70,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/separator/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/separator/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/separator/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/simpleTogglePanel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/simpleTogglePanel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/spacer/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/spacer/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/spacer/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/state/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/state/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/state/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/suggestionbox/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/suggestionbox/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/suggestionbox/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/tabPanel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/tabPanel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/tabPanel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/togglePanel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/togglePanel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/togglePanel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/toolBar/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/toolBar/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/toolBar/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/tooltip/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/tooltip/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/tooltip/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/tree/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/tree/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/tree/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeModel/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeModel/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeModel/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <id>generate-sources</id> @@ -45,12 +45,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeTable/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeTable/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/treeTable/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/virtualEarth/pom.xml =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/virtualEarth/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/virtualEarth/pom.xml 2010-02-18 11:26:25 UTC (rev 16467) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.SP1</version> + <version>3.3.1.SP1_RFPL-394</version> <executions> <execution> <phase>generate-sources</phase>

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16466 - in root: cdk-sandbox and 13 other directories.

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

Author: nbelaevski Date: 2010-02-17 07:47:39 -0500 (Wed, 17 Feb 2010) New Revision: 16466 Added: root/cdk-sandbox/ root/cdk-sandbox/branches/ root/cdk-sandbox/tags/ root/cdk-sandbox/trunk/ root/cdk-sandbox/trunk/xsd2javadoc/ root/cdk-sandbox/trunk/xsd2javadoc/pom.xml root/cdk-sandbox/trunk/xsd2javadoc/src/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/BodyContent.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ExtensibleType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/FunctionType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/IconType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ObjectFactory.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TagType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldAttributeType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredMethodType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredValueType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldExtensionType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldTaglibType.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/package-info.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/CatalogModelImpl.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformer.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformerUtils.java root/cdk-sandbox/trunk/xsd2javadoc/src/main/resources/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-frame.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-noframe.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/function.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/help-doc.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/index.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-frame.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-summary.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/stylesheet.css root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tag.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-frame.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-summary.html.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_1-tld1_2.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_2-tld2_0.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_0-tld2_1.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_1-tld2_1.xsl root/cdk-sandbox/trunk/xsd2javadoc/src/test/ root/cdk-sandbox/trunk/xsd2javadoc/src/test/java/ Log: xsd2javadoc module initial check-in Added: root/cdk-sandbox/trunk/xsd2javadoc/pom.xml =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/pom.xml (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/pom.xml 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,142 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>xsd2javadoc</artifactId> + <packaging>jar</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>xsd2javadoc</name> + <url>http://maven.apache.org</url> + <repositories> + <repository> + <id>bits.netbeans.org</id> + <url>http://bits.netbeans.org/maven2</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.netbeans.modules</groupId> + <artifactId>org-netbeans-modules-xml-axi</artifactId> + <version>RELEASE68</version> + </dependency> +  +  +  + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>tlddoc</id> + <phase>process-resources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>taglibrarydoc</groupId> + <artifactId>tlddoc</artifactId> + <version>1.3</version> + </dependency> + </dependencies> + <configuration> + <includeProjectDependencies>false</includeProjectDependencies> + <includePluginDependencies>true</includePluginDependencies> + <executableDependency> + <groupId>taglibrarydoc</groupId> + <artifactId>tlddoc</artifactId> + </executableDependency> + <mainClass>com.sun.tlddoc.TLDDoc</mainClass> + <arguments> + <argument>-d</argument> + <argument>${project.build.directory}/generated-resources/docs/vdldocs</argument> + <argument>-xslt</argument> + <argument>${basedir}/src/main/xslt/tlddoc</argument> + <argument>${project.build.directory}/generated-resources/tlds/cdk.tld</argument> + <argument>${project.build.directory}/generated-resources/tlds/composite.tld</argument> + <argument>${project.build.directory}/generated-resources/tlds/c.tld</argument> + </arguments> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/BodyContent.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/BodyContent.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/BodyContent.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,34 @@ +/* + * 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.taglib.model; + +/** + * @author Nick Belaevski + * + */ +public enum BodyContent { + + tagdependent, + JSP, + empty, + scriptless +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ExtensibleType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ExtensibleType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ExtensibleType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,84 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The extensibleType is an abstract base type that + * is used to + * define the type of extension-elements. Instance documents + * must substitute a known type to define the extension by + * using + * xsi:type attribute to define the actual type of + * extension-elements. + * + * + * + * <p>Java class for extensibleType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="extensibleType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "extensibleType") +public abstract class ExtensibleType { + + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/FunctionType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/FunctionType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/FunctionType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,369 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The function element is used to provide + * information on each + * function in the tag library that is to be exposed + * to the EL. + * + * The function element may have several subelements + * defining: + * + * description Optional tag-specific information + * + * display-name A + * short name that is intended to be + * displayed by tools + * + * icon Optional + * icon element that can be used + * by tools + * + * name A unique name for this + * function + * + * function-class Provides the name of the Java class that + * implements the function + * + * function-signature Provides the signature, as + * in the Java + * Language Specification, of the Java + * method that is to be + * used to implement + * the function. + * + * example Optional informal description + * of an + * example of a use of this function + * + * function-extension Zero or + * more extensions that provide extra + * information about this function, + * for tool + * consumption + * + * + * + * <p>Java class for functionType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="functionType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <group ref="{http://java.sun.com/xml/ns/javaee}descriptionGroup"/> + * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="function-class" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="function-signature" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="example" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="function-extension" type="{http://java.sun.com/xml/ns/javaee}tld-extensionType" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "functionType", propOrder = { + "description", + "displayName", + "icon", + "name", + "functionClass", + "functionSignature", + "example", + "functionExtension" +}) +public class FunctionType { + + @XmlElementWrapper(name = "description") + @XmlAnyElement(lax = true) + @XmlMixed + protected List<Object> description; + @XmlElement(name = "display-name") + protected List<String> displayName; + protected List<IconType> icon; + @XmlElement(required = true) + protected String name; + @XmlElement(name = "function-class", required = true) + protected String functionClass; + @XmlElement(name = "function-signature", required = true) + protected String functionSignature; + protected String example; + @XmlElement(name = "function-extension") + protected List<TldExtensionType> functionExtension; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the description property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the description property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDescription().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescriptionType } + * + * + */ + public List<Object> getDescription() { + if (description == null) { + description = new ArrayList<Object>(); + } + return this.description; + } + + /** + * Gets the value of the displayName property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the displayName property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDisplayName().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DisplayNameType } + * + * + */ + public List<String> getDisplayName() { + if (displayName == null) { + displayName = new ArrayList<String>(); + } + return this.displayName; + } + + /** + * Gets the value of the icon property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the icon property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getIcon().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link IconType } + * + * + */ + public List<IconType> getIcon() { + if (icon == null) { + icon = new ArrayList<IconType>(); + } + return this.icon; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the functionClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFunctionClass() { + return functionClass; + } + + /** + * Sets the value of the functionClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFunctionClass(String value) { + this.functionClass = value; + } + + /** + * Gets the value of the functionSignature property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFunctionSignature() { + return functionSignature; + } + + /** + * Sets the value of the functionSignature property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFunctionSignature(String value) { + this.functionSignature = value; + } + + /** + * Gets the value of the example property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getExample() { + return example; + } + + /** + * Sets the value of the example property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setExample(String value) { + this.example = value; + } + + /** + * Gets the value of the functionExtension property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the functionExtension property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFunctionExtension().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link TldExtensionType } + * + * + */ + public List<TldExtensionType> getFunctionExtension() { + if (functionExtension == null) { + functionExtension = new ArrayList<TldExtensionType>(); + } + return this.functionExtension; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/IconType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/IconType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/IconType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,145 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The icon type contains small-icon and large-icon elements + * that specify the file names for small and large GIF, JPEG, + * or PNG icon images used to represent the parent element in a + * GUI tool. + * + * The xml:lang attribute defines the language that the + * icon file names are provided in. Its value is "en" (English) + * by default. + * + * + * + * <p>Java class for iconType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="iconType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="small-icon" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="large-icon" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "iconType", propOrder = { + "smallIcon", + "largeIcon" +}) +public class IconType { + + @XmlElement(name = "small-icon") + protected String smallIcon; + @XmlElement(name = "large-icon") + protected String largeIcon; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the smallIcon property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSmallIcon() { + return smallIcon; + } + + /** + * Sets the value of the smallIcon property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSmallIcon(String value) { + this.smallIcon = value; + } + + /** + * Gets the value of the largeIcon property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLargeIcon() { + return largeIcon; + } + + /** + * Sets the value of the largeIcon property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLargeIcon(String value) { + this.largeIcon = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ObjectFactory.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ObjectFactory.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/ObjectFactory.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,116 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.richfaces.taglib.model package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _Taglib_QNAME = new QName("http://java.sun.com/xml/ns/javaee", "taglib"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.richfaces.taglib.model + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link TldAttributeType } + * + */ + public TldAttributeType createTldAttributeType() { + return new TldAttributeType(); + } + + /** + * Create an instance of {@link TldExtensionType } + * + */ + public TldExtensionType createTldExtensionType() { + return new TldExtensionType(); + } + + /** + * Create an instance of {@link TldDeferredValueType } + * + */ + public TldDeferredValueType createTldDeferredValueType() { + return new TldDeferredValueType(); + } + + /** + * Create an instance of {@link IconType } + * + */ + public IconType createIconType() { + return new IconType(); + } + + /** + * Create an instance of {@link TldTaglibType } + * + */ + public TldTaglibType createTldTaglibType() { + return new TldTaglibType(); + } + + /** + * Create an instance of {@link FunctionType } + * + */ + public FunctionType createFunctionType() { + return new FunctionType(); + } + + /** + * Create an instance of {@link TldDeferredMethodType } + * + */ + public TldDeferredMethodType createTldDeferredMethodType() { + return new TldDeferredMethodType(); + } + + /** + * Create an instance of {@link TagType } + * + */ + public TagType createTagType() { + return new TagType(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TldTaglibType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee", name = "taglib") + public JAXBElement<TldTaglibType> createTaglib(TldTaglibType value) { + return new JAXBElement<TldTaglibType>(_Taglib_QNAME, TldTaglibType.class, null, value); + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TagType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TagType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TagType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,468 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The tag defines a unique tag in this tag library. + * It has one + * attribute, id. + * + * The tag element may have several subelements + * defining: + * + * description Optional tag-specific information + * + * display-name A + * short name that is intended to be + * displayed by tools + * + * icon Optional + * icon element that can be used + * by tools + * + * name The unique action name + * + * tag-class The tag handler class implementing + * javax.servlet.jsp.tagext.JspTag + * + * tei-class An optional subclass of + * javax.servlet.jsp.tagext.TagExtraInfo + * + * body-content The body content + * type + * + * variable Optional scripting variable information + * + * attribute All + * attributes of this action that are + * evaluated prior to invocation. + * + * dynamic-attributes Whether this tag supports additional + * attributes + * with dynamic names. If + * true, the tag-class must implement the + * javax.servlet.jsp.tagext.DynamicAttributes + * interface. Defaults to + * false. + * + * example Optional informal description of an + * example of a use of + * this tag + * + * tag-extension Zero or more extensions that provide extra + * information about this tag, for tool + * consumption + * + * + * + * <p>Java class for tagType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tagType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <group ref="{http://java.sun.com/xml/ns/javaee}descriptionGroup"/> + * <element name="name" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN"/> + * <element name="tag-class" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="tei-class" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="body-content" type="{http://java.sun.com/xml/ns/javaee}body-contentType"/> + * <element name="attribute" type="{http://java.sun.com/xml/ns/javaee}tld-attributeType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="dynamic-attributes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <element name="example" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="tag-extension" type="{http://java.sun.com/xml/ns/javaee}tld-extensionType" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tagType", propOrder = { + "description", + "displayName", + "icon", + "name", + "tagClass", + "teiClass", + "bodyContent", + "attribute", + "dynamicAttributes", + "example", + "tagExtension" +}) +public class TagType { + + @XmlElementWrapper(name = "description") + @XmlAnyElement(lax = true) + @XmlMixed + protected List<Object> description; + @XmlElement(name = "display-name") + protected List<String> displayName; + protected List<IconType> icon; + @XmlElement(required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "NMTOKEN") + protected String name; + @XmlElement(name = "tag-class", required = true) + protected String tagClass; + @XmlElement(name = "tei-class") + protected String teiClass; + @XmlElement(name = "body-content", required = true) + protected BodyContent bodyContent = BodyContent.JSP; + protected List<TldAttributeType> attribute; + @XmlElement(name = "dynamic-attributes") + protected Boolean dynamicAttributes; + protected String example; + @XmlElement(name = "tag-extension") + protected List<TldExtensionType> tagExtension; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the description property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the description property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDescription().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescriptionType } + * + * + */ + public List<Object> getDescription() { + if (description == null) { + description = new ArrayList<Object>(); + } + return this.description; + } + + /** + * Gets the value of the displayName property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the displayName property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDisplayName().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DisplayNameType } + * + * + */ + public List<String> getDisplayName() { + if (displayName == null) { + displayName = new ArrayList<String>(); + } + return this.displayName; + } + + /** + * Gets the value of the icon property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the icon property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getIcon().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link IconType } + * + * + */ + public List<IconType> getIcon() { + if (icon == null) { + icon = new ArrayList<IconType>(); + } + return this.icon; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the tagClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTagClass() { + return tagClass; + } + + /** + * Sets the value of the tagClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTagClass(String value) { + this.tagClass = value; + } + + /** + * Gets the value of the teiClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTeiClass() { + return teiClass; + } + + /** + * Sets the value of the teiClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTeiClass(String value) { + this.teiClass = value; + } + + /** + * Gets the value of the bodyContent property. + * + * @return + * possible object is + * {@link BodyContentType } + * + */ + public BodyContent getBodyContent() { + return bodyContent; + } + + /** + * Sets the value of the bodyContent property. + * + * @param value + * allowed object is + * {@link BodyContentType } + * + */ + public void setBodyContent(BodyContent value) { + this.bodyContent = value; + } + + /** + * Gets the value of the attribute property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the attribute property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getAttribute().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link TldAttributeType } + * + * + */ + public List<TldAttributeType> getAttribute() { + if (attribute == null) { + attribute = new ArrayList<TldAttributeType>(); + } + return this.attribute; + } + + /** + * Gets the value of the dynamicAttributes property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isDynamicAttributes() { + return dynamicAttributes; + } + + /** + * Sets the value of the dynamicAttributes property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setDynamicAttributes(Boolean value) { + this.dynamicAttributes = value; + } + + /** + * Gets the value of the example property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getExample() { + return example; + } + + /** + * Sets the value of the example property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setExample(String value) { + this.example = value; + } + + /** + * Gets the value of the tagExtension property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the tagExtension property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getTagExtension().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link TldExtensionType } + * + * + */ + public List<TldExtensionType> getTagExtension() { + if (tagExtension == null) { + tagExtension = new ArrayList<TldExtensionType>(); + } + return this.tagExtension; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldAttributeType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldAttributeType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldAttributeType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,347 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The attribute element defines an attribute for the + * nesting + * tag. The attribute element may have several subelements + * defining: + * + * description a description of the attribute + * + * name the name of + * the attribute + * + * required whether the attribute is required or + * optional + * + * rtexprvalue whether the attribute is a runtime attribute + * + * type the + * type of the attributes + * + * fragment whether this attribute is a fragment + * + * deferred-value present if this attribute is to be parsed as a + * javax.el.ValueExpression + * + * deferred-method present if this attribute is + * to be parsed as a + * javax.el.MethodExpression + * + * + * + * <p>Java class for tld-attributeType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tld-attributeType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="description" type="{http://java.sun.com/xml/ns/javaee}descriptionType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="required" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <choice> + * <sequence> + * <sequence minOccurs="0"> + * <element name="rtexprvalue" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * <choice> + * <element name="deferred-value" type="{http://java.sun.com/xml/ns/javaee}tld-deferred-valueType" minOccurs="0"/> + * <element name="deferred-method" type="{http://java.sun.com/xml/ns/javaee}tld-deferred-methodType" minOccurs="0"/> + * </choice> + * </sequence> + * <element name="fragment" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * </choice> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tld-attributeType", propOrder = { + "description", + "name", + "required", + "rtexprvalue", + "type", + "deferredValue", + "deferredMethod", + "fragment" +}) +public class TldAttributeType { + + @XmlElementWrapper(name = "description") + @XmlAnyElement(lax = true) + @XmlMixed + protected List<Object> description; + @XmlElement(required = true) + protected String name; + protected Boolean required; + protected Boolean rtexprvalue = true; + protected String type; + @XmlElement(name = "deferred-value") + protected TldDeferredValueType deferredValue; + @XmlElement(name = "deferred-method") + protected TldDeferredMethodType deferredMethod; + protected Boolean fragment; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the description property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the description property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDescription().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescriptionType } + * + * + */ + public List<Object> getDescription() { + if (description == null) { + description = new ArrayList<Object>(); + } + return this.description; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the required property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isRequired() { + return required; + } + + /** + * Sets the value of the required property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequired(Boolean value) { + this.required = value; + } + + /** + * Gets the value of the rtexprvalue property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isRtexprvalue() { + return rtexprvalue; + } + + /** + * Sets the value of the rtexprvalue property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRtexprvalue(Boolean value) { + this.rtexprvalue = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the deferredValue property. + * + * @return + * possible object is + * {@link TldDeferredValueType } + * + */ + public TldDeferredValueType getDeferredValue() { + return deferredValue; + } + + /** + * Sets the value of the deferredValue property. + * + * @param value + * allowed object is + * {@link TldDeferredValueType } + * + */ + public void setDeferredValue(TldDeferredValueType value) { + this.deferredValue = value; + } + + /** + * Gets the value of the deferredMethod property. + * + * @return + * possible object is + * {@link TldDeferredMethodType } + * + */ + public TldDeferredMethodType getDeferredMethod() { + return deferredMethod; + } + + /** + * Sets the value of the deferredMethod property. + * + * @param value + * allowed object is + * {@link TldDeferredMethodType } + * + */ + public void setDeferredMethod(TldDeferredMethodType value) { + this.deferredMethod = value; + } + + /** + * Gets the value of the fragment property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isFragment() { + return fragment; + } + + /** + * Sets the value of the fragment property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setFragment(Boolean value) { + this.fragment = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredMethodType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredMethodType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredMethodType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,120 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * Defines information about how to provide the value + * for a + * tag handler attribute that accepts a javax.el.MethodExpression. + * + * The deferred-method element has one optional subelement: + * + * method-signature Provides the signature, as in the Java + * Language + * Specifies, that is expected for + * the method being identified by the + * expression. + * + * + * + * <p>Java class for tld-deferred-methodType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tld-deferred-methodType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="method-signature" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tld-deferred-methodType", propOrder = { + "methodSignature" +}) +public class TldDeferredMethodType { + + @XmlElement(name = "method-signature") + protected String methodSignature; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the methodSignature property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMethodSignature() { + return methodSignature; + } + + /** + * Sets the value of the methodSignature property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMethodSignature(String value) { + this.methodSignature = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredValueType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredValueType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldDeferredValueType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,115 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * Defines information about how to provide the value + * for a + * tag handler attribute that accepts a javax.el.ValueExpression. + * + * The deferred-value element has one optional subelement: + * + * type the + * expected type of the attribute + * + * + * + * <p>Java class for tld-deferred-valueType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tld-deferred-valueType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tld-deferred-valueType", propOrder = { + "type" +}) +public class TldDeferredValueType { + + protected String type; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldExtensionType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldExtensionType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldExtensionType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,161 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The tld-extensionType is used to indicate + * extensions to a specific TLD element. + * + * It is used by elements to + * designate an extension block + * that is targeted to a specific extension + * designated by + * a set of extension elements that are declared by a + * namespace. The namespace identifies the extension to + * the tool that + * processes the extension. + * + * The type of the extension-element is + * abstract. Therefore, + * a concrete type must be specified by the TLD + * using + * xsi:type attribute for each extension-element. + * + * + * + * <p>Java class for tld-extensionType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tld-extensionType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="extension-element" type="{http://java.sun.com/xml/ns/javaee}extensibleType" maxOccurs="unbounded"/> + * </sequence> + * <attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tld-extensionType", propOrder = { + "extensionElement" +}) +public class TldExtensionType { + + @XmlElement(name = "extension-element", required = true) + protected List<ExtensibleType> extensionElement; + @XmlAttribute(required = true) + @XmlSchemaType(name = "anyURI") + protected String namespace; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the extensionElement property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the extensionElement property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getExtensionElement().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link ExtensibleType } + * + * + */ + public List<ExtensibleType> getExtensionElement() { + if (extensionElement == null) { + extensionElement = new ArrayList<ExtensibleType>(); + } + return this.extensionElement; + } + + /** + * Gets the value of the namespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNamespace() { + return namespace; + } + + /** + * Sets the value of the namespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNamespace(String value) { + this.namespace = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldTaglibType.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldTaglibType.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/TldTaglibType.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,451 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + + +package org.richfaces.taglib.model; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * + * + * The taglib tag is the document root, it defines: + * + * description a simple string describing the "use" of this + * taglib, + * should be user discernable + * + * display-name the display-name element + * contains a + * short name that is intended to be displayed + * by tools + * + * icon + * optional icon that can be used by tools + * + * tlib-version the version of + * the tag library implementation + * + * short-name a simple default short name + * that could be + * used by a JSP authoring tool to create + * names with a + * mnemonic value; for example, + * the it may be used as the prefered + * prefix + * value in taglib directives + * + * uri a uri uniquely identifying this + * taglib + * + * validator optional TagLibraryValidator information + * + * listener + * optional event listener specification + * + * tag tags in this tag library + * + * tag-file tag files in this tag library + * + * function zero or more EL + * functions defined in this + * tag library + * + * taglib-extension zero or more + * extensions that provide extra + * information about this taglib, for tool + * consumption + * + * + * + * <p>Java class for tldTaglibType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="tldTaglibType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <group ref="{http://java.sun.com/xml/ns/javaee}descriptionGroup"/> + * <element name="tlib-version" type="{http://java.sun.com/xml/ns/javaee}dewey-versionType"/> + * <element name="short-name" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN"/> + * <element name="uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> + * <element name="tag" type="{http://java.sun.com/xml/ns/javaee}tagType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="function" type="{http://java.sun.com/xml/ns/javaee}functionType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="taglib-extension" type="{http://java.sun.com/xml/ns/javaee}tld-extensionType" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="version" use="required" type="{http://java.sun.com/xml/ns/javaee}dewey-versionType" fixed="2.1" /> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "tldTaglibType", propOrder = { + "description", + "displayName", + "icon", + "tlibVersion", + "shortName", + "uri", + "tag", + "function", + "taglibExtension" +}) +public class TldTaglibType { + + @XmlElementWrapper(name = "description") + @XmlAnyElement(lax = true) + @XmlMixed + protected List<Object> description; + @XmlElement(name = "display-name") + protected List<String> displayName; + protected List<IconType> icon; + @XmlElement(name = "tlib-version", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String tlibVersion = "1.0"; + @XmlElement(name = "short-name", required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlSchemaType(name = "NMTOKEN") + protected String shortName; + @XmlSchemaType(name = "anyURI") + protected String uri; + protected List<TagType> tag; + protected List<FunctionType> function; + @XmlElement(name = "taglib-extension") + protected List<TldExtensionType> taglibExtension; + @XmlAttribute(required = true) + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + protected String version = "2.1"; + @XmlAttribute + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + +// @XmlAttribute(name = "schemaLocation", namespace = "http://www.w3.org/2001/XMLSchema-instance") +// private final String schemaLocation = "http://java.sun.com/xml/ns/javaee " + +// "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"; + + /** + * Gets the value of the description property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the description property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDescription().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescriptionType } + * + * + */ + public List<Object> getDescription() { + if (description == null) { + description = new ArrayList<Object>(); + } + return this.description; + } + + /** + * Gets the value of the displayName property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the displayName property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDisplayName().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DisplayNameType } + * + * + */ + public List<String> getDisplayName() { + if (displayName == null) { + displayName = new ArrayList<String>(); + } + return this.displayName; + } + + /** + * Gets the value of the icon property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the icon property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getIcon().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link IconType } + * + * + */ + public List<IconType> getIcon() { + if (icon == null) { + icon = new ArrayList<IconType>(); + } + return this.icon; + } + + /** + * Gets the value of the tlibVersion property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTlibVersion() { + return tlibVersion; + } + + /** + * Sets the value of the tlibVersion property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTlibVersion(String value) { + this.tlibVersion = value; + } + + /** + * Gets the value of the shortName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getShortName() { + return shortName; + } + + /** + * Sets the value of the shortName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setShortName(String value) { + this.shortName = value; + } + + /** + * Gets the value of the uri property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUri() { + return uri; + } + + /** + * Sets the value of the uri property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUri(String value) { + this.uri = value; + } + + /** + * Gets the value of the tag property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the tag property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getTag().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link TagType } + * + * + */ + public List<TagType> getTag() { + if (tag == null) { + tag = new ArrayList<TagType>(); + } + return this.tag; + } + + /** + * Gets the value of the function property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the function property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFunction().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link FunctionType } + * + * + */ + public List<FunctionType> getFunction() { + if (function == null) { + function = new ArrayList<FunctionType>(); + } + return this.function; + } + + /** + * Gets the value of the taglibExtension property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the taglibExtension property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getTaglibExtension().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link TldExtensionType } + * + * + */ + public List<TldExtensionType> getTaglibExtension() { + if (taglibExtension == null) { + taglibExtension = new ArrayList<TldExtensionType>(); + } + return this.taglibExtension; + } + + /** + * Gets the value of the version property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersion() { + if (version == null) { + return "2.1"; + } else { + return version; + } + } + + /** + * Sets the value of the version property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersion(String value) { + this.version = value; + } + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/package-info.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/package-info.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/taglib/model/package-info.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,9 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2010.02.16 at 01:15:02 AM EET +// + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/javaee", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.richfaces.taglib.model; Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/CatalogModelImpl.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/CatalogModelImpl.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/CatalogModelImpl.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,78 @@ +package org.richfaces.xsd2tld; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; + +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; + +import org.netbeans.modules.xml.xam.ModelSource; +import org.netbeans.modules.xml.xam.locator.CatalogModel; +import org.netbeans.modules.xml.xam.locator.CatalogModelException; +import org.netbeans.modules.xml.xam.spi.DocumentModelAccessProvider; +import org.openide.util.lookup.Lookups; +import org.w3c.dom.ls.LSInput; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * @author Nick Belaevski + * + */ +final class CatalogModelImpl implements CatalogModel { + + private static CatalogModel instance; + + protected CatalogModelImpl() { + } + + public static CatalogModel getInstance() { + if (instance == null) { + instance = new CatalogModelImpl(); + } + return instance; + } + + public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { + // TODO Auto-generated method stub + return null; + } + + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { + // TODO Auto-generated method stub + return null; + } + + public ModelSource getModelSource(URI locationURI, ModelSource modelSourceOfSourceDocument) + throws CatalogModelException { + DocumentModelAccessProvider accessProvider = modelSourceOfSourceDocument.getLookup().lookup( + DocumentModelAccessProvider.class); + if (accessProvider != null) { + File file = (File) accessProvider.getModelSourceKey(modelSourceOfSourceDocument); + File parentFile = file.getParentFile(); + File modelFile = new File(parentFile, locationURI.getPath()); + + Document document; + try { + document = accessProvider.loadSwingDocument(new FileInputStream(modelFile)); + return new ModelSource(Lookups.fixed(document, modelFile, this, accessProvider), false); + } catch (FileNotFoundException e) { + throw new CatalogModelException(e); + } catch (IOException e) { + throw new CatalogModelException(e); + } catch (BadLocationException e) { + throw new CatalogModelException(e); + } + } + + return null; + } + + public ModelSource getModelSource(URI locationURI) throws CatalogModelException { + // TODO Auto-generated method stub + return null; + } +} \ No newline at end of file Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformer.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformer.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformer.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,299 @@ +package org.richfaces.xsd2tld; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.createLookup; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.createTagClassName; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.getJavaClassNameByType; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.getShortName; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.normalizeXml; +import static org.richfaces.xsd2tld.SchemaTransformerUtils.parseLiteralHash; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.bind.JAXB; + +import org.netbeans.modules.xml.axi.AXIComponent; +import org.netbeans.modules.xml.axi.AXIModel; +import org.netbeans.modules.xml.axi.AXIModelFactory; +import org.netbeans.modules.xml.axi.AXIType; +import org.netbeans.modules.xml.axi.AbstractAttribute; +import org.netbeans.modules.xml.axi.Attribute; +import org.netbeans.modules.xml.axi.Element; +import org.netbeans.modules.xml.axi.datatype.Datatype; +import org.netbeans.modules.xml.axi.visitor.AXINonCyclicVisitor; +import org.netbeans.modules.xml.schema.model.Annotation; +import org.netbeans.modules.xml.schema.model.Documentation; +import org.netbeans.modules.xml.schema.model.Schema; +import org.netbeans.modules.xml.schema.model.SchemaComponent; +import org.netbeans.modules.xml.schema.model.SchemaModel; +import org.netbeans.modules.xml.schema.model.SchemaModelFactory; +import org.netbeans.modules.xml.schema.model.Attribute.Use; +import org.netbeans.modules.xml.xam.ModelSource; +import org.richfaces.taglib.model.ObjectFactory; +import org.richfaces.taglib.model.TagType; +import org.richfaces.taglib.model.TldAttributeType; +import org.richfaces.taglib.model.TldTaglibType; + +/* + * 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. + */ + +/** + * @author Nick Belaevski + * + */ +public class SchemaTransformer { + + private static final ObjectFactory objectFactory = new ObjectFactory(); + + private Map<String, TldTaglibType> taglibs = new HashMap<String, TldTaglibType>(); + + private Map<String, String> taglibShortNames = new HashMap<String, String>(); + + private SchemaModelFactory schemaModelFactory = SchemaModelFactory.getDefault(); + + private List<SchemaModel> schemaModels = new ArrayList<SchemaModel>(); + + private AXIModelFactory axiModelFactory = AXIModelFactory.getDefault(); + + private TldTaglibType createTaglib(String namespaceUri) { + TldTaglibType taglib = objectFactory.createTldTaglibType(); + + taglibs.put(namespaceUri, taglib); + taglib.setUri(namespaceUri); + return taglib; + } + + protected SchemaModel parseSchema(String fileName) throws Exception { + ModelSource modelSource = new ModelSource(createLookup(fileName), false); + + SchemaModel schemaModel = schemaModelFactory.getModel(modelSource); + schemaModel.sync(); + + return schemaModel; + } + + public void setTaglibShortNames(Map<String, String> taglibShortNames) { + this.taglibShortNames = taglibShortNames; + } + + public void addSchema(String fileName) throws Exception { + SchemaModel schemaModel = parseSchema(fileName); + schemaModels.add(schemaModel); + } + + public void parseSchemas() { + for (SchemaModel schemaModel : schemaModels) { + Schema schema = schemaModel.getSchema(); + + String targetNamespace = schema.getTargetNamespace(); + TldTaglibType taglib = createTaglib(targetNamespace); + + String shortName = taglibShortNames.get(targetNamespace); + if (shortName == null) { + shortName = getShortName(schema); + } + + taglib.setShortName(shortName); + + Annotation schemaAnnotation = schema.getAnnotation(); + if (schemaAnnotation != null) { + Collection<Documentation> documentationElements = schemaAnnotation.getDocumentationElements(); + if (documentationElements != null) { + List<Object> descriptionsList = taglib.getDescription(); + for (Documentation documentationElement : documentationElements) { + //descriptionsList.addAll(parseRawXml(documentationElement.getContentFragment())); + descriptionsList.add(documentationElement.getContentFragment()); + } + } + } + + addElementsAndAttributes(schemaModel, taglib); + } + + schemaModels.clear(); + } + + public void writeTransformedSchemas(String outputDirectory) { + File outputDirectoryObject = new File(outputDirectory); + outputDirectoryObject.mkdirs(); + + for (TldTaglibType taglib : taglibs.values()) { + File outputFile = new File(outputDirectoryObject, taglib.getShortName() + ".tld"); + outputFile.delete(); + JAXB.marshal(objectFactory.createTaglib(taglib), outputFile); + } + } + + private static String getDocumentation(AXIComponent axiComponent) { + SchemaComponent peer = axiComponent.getPeer(); + if (peer == null || + peer.getAnnotation() == null || + peer.getAnnotation().getDocumentationElements() == null) { + return null; + } + + StringBuilder buffer = new StringBuilder(); + for(Documentation doc : peer.getAnnotation().getDocumentationElements()) { + buffer.append(doc.getContentFragment()); + } + + return buffer.toString(); + } + + private String getElementQName(AXIComponent component) { + return "{" + component.getTargetNamespace() + "}" + ((AXIType) component).getName(); + } + + /** + * @param schema + * @param taglib + */ + private void addElementsAndAttributes(SchemaModel schemaModel, final TldTaglibType taglib) { + final String targetNamespace = schemaModel.getSchema().getTargetNamespace(); + + AXIModel axiModel = axiModelFactory.getModel(schemaModel); + + final Set<String> visitedObjects = new HashSet<String>(); + + axiModel.getRoot().accept(new AXINonCyclicVisitor(axiModel) { + + private void addAttribute(TagType tagType, AbstractAttribute abstractAttribute) { + TldAttributeType tldAttribute = objectFactory.createTldAttributeType(); + + //TODO namespace check + tldAttribute.setName(abstractAttribute.getName()); + + if (abstractAttribute instanceof Attribute) { + Attribute attribute = (Attribute) abstractAttribute; + tldAttribute.setRequired(Use.REQUIRED.equals(attribute.getUse())); + tldAttribute.setType(getJavaClassNameByType( (Datatype) attribute.getType() )); + } else { + //TODO + } + + String attributeDocumentation = getDocumentation(abstractAttribute); + if (attributeDocumentation != null && attributeDocumentation.length() != 0) { + //tldAttribute.getDescription().addAll(parseRawXml(attributeDocumentation)); + tldAttribute.getDescription().add(normalizeXml(attributeDocumentation)); + } + + tagType.getAttribute().add(tldAttribute); + } + + private static final String GLOBAL_ATTRIBUTES = "_global_attributes"; + + @Override + public void visit(Attribute attribute) { + super.visit(attribute); + + if (targetNamespace.equals(attribute.getTargetNamespace()) && attribute.isGlobal() && visitedObjects.add(getElementQName(attribute))) { + TagType globalTagType = null; + List<TagType> tags = taglib.getTag(); + for (TagType tagType : tags) { + if (GLOBAL_ATTRIBUTES.equals(tagType.getName())) { + globalTagType = tagType; + break; + } + } + + if (globalTagType == null) { + globalTagType = objectFactory.createTagType(); + globalTagType.setName(GLOBAL_ATTRIBUTES); + globalTagType.getDescription().add("Global attributes of " + attribute.getTargetNamespace() + " namespace"); + + taglib.getTag().add(globalTagType); + } + + addAttribute(globalTagType, attribute); + } + } + + @Override + public void visit(Element e) { + super.visit(e); + + if (targetNamespace.equals(e.getTargetNamespace()) && visitedObjects.add(getElementQName(e))) { + List<TagType> tagsList = taglib.getTag(); + + TagType tagType = objectFactory.createTagType(); + + String tagName = e.getName(); + tagType.setName(tagName); + tagType.setTagClass(createTagClassName(tagName)); + + String documentation = getDocumentation(e); + if (documentation != null && documentation.length() != 0) { + //tagType.getDescription().addAll(parseRawXml(documentation)); + tagType.getDescription().add(normalizeXml(documentation)); + } + + tagsList.add(tagType); + + List<AbstractAttribute> abstractAttributes = e.getAttributes(); + if (abstractAttributes != null) { + for (AbstractAttribute abstractAttribute : abstractAttributes) { + addAttribute(tagType, abstractAttribute); + } + } + } + } + }); + } + + private static enum State { + FILES, LOCAL_NAMES_HASH, OUTPUT_DIR + } + + public static void main(String[] args) throws Exception { + State state = State.FILES; + + String outputDirectoryPath = null; + SchemaTransformer schemaTransformer = new SchemaTransformer(); + + for (String arg : args) { + if (state == State.LOCAL_NAMES_HASH) { + schemaTransformer.setTaglibShortNames(parseLiteralHash(arg)); + state = State.FILES; + } else if (state == State.OUTPUT_DIR) { + outputDirectoryPath = arg; + state = State.FILES; + } else if (arg.equals("-h")) { + state = State.LOCAL_NAMES_HASH; + } else if (arg.equals("-o")) { + state = State.OUTPUT_DIR; + } else { + schemaTransformer.addSchema(arg); + } + } + + schemaTransformer.parseSchemas(); + + File outputDirectory = new File(outputDirectoryPath); + + schemaTransformer.writeTransformedSchemas(outputDirectory.getAbsolutePath()); + } +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformerUtils.java =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformerUtils.java (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/java/org/richfaces/xsd2tld/SchemaTransformerUtils.java 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,298 @@ +/* + * 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.xsd2tld; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.io.StringWriter; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.swing.text.BadLocationException; +import javax.swing.text.Document; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.netbeans.modules.xml.axi.datatype.Datatype; +import org.netbeans.modules.xml.schema.model.Schema; +import org.netbeans.modules.xml.xam.dom.ReadOnlyAccess; +import org.netbeans.modules.xml.xam.spi.DocumentModelAccessProvider; +import org.openide.util.Lookup; +import org.openide.util.lookup.Lookups; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; +import org.w3c.dom.ls.DOMImplementationLS; +import org.w3c.dom.ls.LSOutput; +import org.w3c.dom.ls.LSSerializer; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * @author Nick Belaevski + * + */ +final class SchemaTransformerUtils { + + private static final String XHTML_DOCUMENT_PROLOG = "<div xmlns=\"http://www.w3.org/1999/xhtml\">"; + private static final String XHTML_DOCUMENT_EPILOG = "</div>"; + private static final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + + private SchemaTransformerUtils() { + } + + static String getJavaClassNameByType(Datatype datatype) { + String result; + + // based on http://java.sun.com/javaee/5/docs/tutorial/doc/bnazq.html#bnazr + switch (datatype.getKind()) { + case STRING: + result = String.class.getName(); + break; + + case INTEGER: + result = BigInteger.class.getName(); + break; + + case INT: + case UNSIGNED_SHORT: + result = Integer.TYPE.getName(); + break; + + case LONG: + case UNSIGNED_INT: + result = Long.TYPE.getName(); + break; + + case SHORT: + case UNSIGNED_BYTE: + result = Short.TYPE.getName(); + break; + + case DECIMAL: + result = BigDecimal.class.getName(); + break; + + case FLOAT: + result = Float.TYPE.getName(); + break; + + case DOUBLE: + result = Double.TYPE.getName(); + break; + + case BOOLEAN: + result = Boolean.TYPE.getName(); + break; + + case BYTE: + result = Byte.TYPE.getName(); + break; + + case QNAME: + result = QName.class.getName(); + break; + + case DATE_TIME: + case DATE: + case TIME: + case G_DAY: + case G_MONTH_DAY: + case G_YEAR: + case G_YEAR_MONTH: + case G_MONTH: + result = XMLGregorianCalendar.class.getName(); + break; + + case BASE64_BINARY: + case HEX_BINARY: + result = Byte.TYPE.getName() + "[]"; + break; + + case DURATION: + result = Duration.class.getName(); + break; + + case NOTATION: + result = QName.class.getName(); + break; + + default: + result = Object.class.getName(); + break; + } + + return result; + } + + static String getShortName(Schema schema) { + String namespaceUri = schema.getTargetNamespace(); + + return namespaceUri.replaceAll("\\W", "_"); + } + + static String capitalize(String s) { + if (s.length() > 0) { + char[] chars = s.toCharArray(); + chars[0] = Character.toUpperCase(chars[0]); + + return new String(chars); + } else { + throw new IllegalArgumentException(s); + } + } + + static String createTagClassName(String tagName) { + return "org.richfaces." + capitalize(tagName) + "Tag"; + } + + private static void convertCDataIntoTextNodes(Node node) { + for (Node childNode = node.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) { + if (childNode.getNodeType() == Node.CDATA_SECTION_NODE) { + org.w3c.dom.Document document = childNode.getOwnerDocument(); + Text textNode = document.createTextNode(childNode.getNodeValue()); + childNode.getParentNode().replaceChild(textNode, childNode); + } + + convertCDataIntoTextNodes(childNode); + } + } + + static List<Object> parseRawXml(String xmlText) { + try { + DocumentBuilder db = dbf.newDocumentBuilder(); + org.w3c.dom.Document document = db.parse(new InputSource(new StringReader(XHTML_DOCUMENT_PROLOG + xmlText + + XHTML_DOCUMENT_EPILOG))); + + org.w3c.dom.Element documentElement = document.getDocumentElement(); + convertCDataIntoTextNodes(documentElement); + documentElement.normalize(); + + List<Object> result = new ArrayList<Object>(); + NodeList childNodes = documentElement.getChildNodes(); + int childNodesLength = childNodes.getLength(); + for (int i = 0; i < childNodesLength; i++) { + Node item = childNodes.item(i); + switch (item.getNodeType()) { + case Node.TEXT_NODE: + result.add(item.getNodeValue()); + break; + + case Node.ELEMENT_NODE: + result.add(item); + break; + + default: + // don't process + break; + } + } + + return result; + } catch (ParserConfigurationException e) { + throw new RuntimeException(e.getMessage(), e); + } catch (SAXException e) { + throw new RuntimeException(e.getMessage(), e); + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + static Lookup createLookup(String fileName) { + DocumentModelAccessProvider provider = ReadOnlyAccess.Provider.getInstance(); + + File file = new File(fileName); + Document document = null; + InputStream in = null; + try { + in = new FileInputStream(file); + document = provider.loadSwingDocument(in); + + return Lookups.fixed(file, document, CatalogModelImpl.getInstance(), provider); + } catch (FileNotFoundException e) { + throw new RuntimeException(e.getMessage(), e); + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } catch (BadLocationException e) { + throw new RuntimeException(e.getMessage(), e); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + // ignore + } + } + } + } + + static Map<String, String> parseLiteralHash(String hashString) { + HashMap<String, String> result = new HashMap<String, String>(); + + String[] splits = hashString.replaceAll("\\{|\\}", "").split(","); + for (String split : splits) { + String[] ss = split.split("="); + result.put(ss[0], ss[1]); + } + + return result; + } + + static String normalizeXml(String rawXml) { + StringWriter resultWriter = new StringWriter(); + List<Object> parsedXml = parseRawXml(rawXml); + + for (Object object : parsedXml) { + if (object instanceof String) { + resultWriter.write((String) object); + } else if (object instanceof Node) { + Node node = (Node) object; + + DOMImplementationLS lsImplementation = (DOMImplementationLS) node.getOwnerDocument() + .getImplementation().getFeature("LS", "3.0"); + + LSOutput lsOutput = lsImplementation.createLSOutput(); + lsOutput.setCharacterStream(resultWriter); + + LSSerializer lsSerializer = lsImplementation.createLSSerializer(); + lsSerializer.getDomConfig().setParameter("xml-declaration", Boolean.FALSE); + lsSerializer.write(node, lsOutput); + } else { + throw new IllegalArgumentException(); + } + } + + return resultWriter.toString(); + } +} Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-frame.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-frame.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-frame.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <html> + <head> + <title>All Tags / Attributes</title> + <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/> + </head> + <script> + function asd() + { + parent.document.title="All Tags / Attributes"; + } + </script> + <body bgcolor="white" onload="asd();"> + <font size="+1" class="FrameHeadingFont"> + <b>All Tags / Attributes</b></font> + <br/> + <table border="0" width="100%"> + <tr> + <td nowrap="true"><font class="FrameItemFont"> + <xsl:apply-templates + select="javaee:tlds/javaee:taglib/javaee:tag|javaee:tlds/javaee:taglib/javaee:tag-file|javaee:tlds/javaee:taglib/javaee:function"> + <xsl:sort select="../javaee:short-name"/> + <xsl:sort select="javaee:name"/> + </xsl:apply-templates> + </font></td> + </tr> + </table> + </body> + </html> + </xsl:template> + + <xsl:template match="javaee:tag|javaee:tag-file"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:attribute name="target">tagFrame</xsl:attribute> + <xsl:value-of select="../javaee:short-name"/>: + <xsl:call-template name="getTagName"> + <xsl:with-param name="tagName" select="string(javaee:name)" /> + </xsl:call-template> + </xsl:element> + <br/> + </xsl:template> + + <xsl:template name="getTagName"> + <xsl:param name="tagName" /> + <xsl:choose> + <xsl:when test="$tagName = '_global_attributes'"> + @* + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tagName" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + <xsl:template match="javaee:function"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:attribute name="target">tagFrame</xsl:attribute> + <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i> + </xsl:element> + <br/> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-noframe.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-noframe.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/alltags-noframe.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <html> + <head> + <title>All Tags / Attributes</title> + <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/> + </head> + <script> + function asd() + { + parent.document.title="All Tags / Attributes"; + } + </script> + <body bgcolor="white" onload="asd();"> + <font size="+1" class="FrameHeadingFont"> + <b>All Tags / Attributes</b></font> + <br/> + <table border="0" width="100%"> + <tr> + <td nowrap="true"><font class="FrameItemFont"> + <xsl:apply-templates + select="javaee:tlds/javaee:taglib/javaee:tag|javaee:tlds/javaee:taglib/javaee:tag-file|javaee:tlds/javaee:taglib/javaee:function"> + <xsl:sort select="../javaee:short-name"/> + <xsl:sort select="javaee:name"/> + </xsl:apply-templates> + </font></td> + </tr> + </table> + </body> + </html> + </xsl:template> + + <xsl:template match="javaee:tag|javaee:tag-file"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:attribute name="target"></xsl:attribute> + <xsl:value-of select="../javaee:short-name"/>: + <xsl:call-template name="getTagName"> + <xsl:with-param name="tagName" select="string(javaee:name)" /> + </xsl:call-template> + </xsl:element> + <br/> + </xsl:template> + + <xsl:template name="getTagName"> + <xsl:param name="tagName" /> + <xsl:choose> + <xsl:when test="$tagName = '_global_attributes'"> + @* + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tagName" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +  + <xsl:template match="javaee:function"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="../javaee:short-name"/>/<xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:attribute name="target">tagFrame</xsl:attribute> + <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i> + </xsl:element> + <br/> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/function.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/function.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/function.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,276 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + + <xsl:param name="tlddoc-shortName">default</xsl:param> + <xsl:param name="tlddoc-functionName">default</xsl:param> + +  + <xsl:template match="/"> + <xsl:apply-templates select="javaee:tlds/javaee:taglib"/> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <xsl:if test="javaee:short-name=$tlddoc-shortName"> + <xsl:apply-templates select="javaee:function"/> + </xsl:if> + </xsl:template> + + <xsl:template match="javaee:function"> + <xsl:if test="javaee:name=$tlddoc-functionName"> + <xsl:variable name="tldname"> + <xsl:choose> + <xsl:when test="../javaee:display-name!=''"> + <xsl:value-of select="../javaee:display-name"/> + </xsl:when> + <xsl:when test="../javaee:short-name!=''"> + <xsl:value-of select="../javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="title"> + <xsl:value-of select="javaee:name"/> + (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </xsl:variable> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <meta name="keywords" content="$title"/> + <link rel="stylesheet" type="text/css" href="../stylesheet.css" + title="Style"/> + </head> + <script> + function asd() + { + parent.document.title="<xsl:value-of select="normalize-space($title)"/>"; + } + </script> + <body bgcolor="white" onload="asd();"> +  + <a name="navbar_top"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_top_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Tag </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:attribute name="target">_top</xsl:attribute> + <b>NO FRAMES</b> + </xsl:element>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + + <hr/> + <h2><font size="-1"><xsl:value-of select="$tldname"/></font><br/> + Function <xsl:value-of select="javaee:name"/></h2> + <code> + <xsl:value-of select='substring-before(normalize-space(javaee:function-signature)," ")'/> + <b> <xsl:value-of select="javaee:name"/></b>(<xsl:value-of + select='substring-after(normalize-space(javaee:function-signature),"(")'/> + </code> + <hr/> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/><br/> + <p/> + <xsl:if test="javaee:example!=''"> + <b>Example:</b><br/> + <pre> +<xsl:value-of select="javaee:example"/> + </pre> + <p/> + </xsl:if> + <hr/> + +  + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td colspan="2"> + <font size="+2"> + <b>Function Information</b> + </font> + </td> + </tr> + <tr> + <td>Function Class</td> + <td> + <xsl:choose> + <xsl:when test="javaee:function-class!=''"> + <xsl:value-of select="javaee:function-class"/> + </xsl:when> + <xsl:otherwise> + <i>None</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + <tr> + <td>Function Signature</td> + <td> + <xsl:choose> + <xsl:when test="javaee:function-signature!=''"> + <xsl:value-of select="javaee:function-signature"/> + </xsl:when> + <xsl:otherwise> + <i>None</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + <tr> + <td>Display Name</td> + <td> + <xsl:choose> + <xsl:when test="javaee:display-name!=''"> + <xsl:value-of select="javaee:display-name"/> + </xsl:when> + <xsl:otherwise> + <i>None</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </table> + <br/> + <p/> + +  + <a name="navbar_bottom"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_bottom_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Tag </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:attribute name="target">_top</xsl:attribute> + <b>NO FRAMES</b> + </xsl:element>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + <hr/> + <small><i> + Output Generated by + <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>. + Java, JSP, and JavaServer Pages are trademarks or + registered trademarks of Sun Microsystems, Inc. in the US and other + countries. Copyright 2002-4 Sun Microsystems, Inc. + 4150 Network Circle + Santa Clara, CA 95054, U.S.A. + All Rights Reserved. + </i></small> + </body> + </html> + </xsl:if> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/help-doc.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/help-doc.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/help-doc.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,235 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <HTML> + <HEAD> + <TITLE> + API Help (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </TITLE> + <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style"/> + </HEAD> + <SCRIPT> + function asd() { + parent.document.title="API Help (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)"; + } + </SCRIPT> + <BODY BGCOLOR="white" onload="asd();"> + <a name="navbar_top"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_top_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1">  <a href="overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Library </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"><b>Help</b></font> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  PREV  +  NEXT  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="help-doc.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> + <HR/> + <CENTER> + <H1>How This Tag Library Document Is Organized</H1> + </CENTER> + This TLD (Tag Library Descriptor) document has pages corresponding + to the items in the navigation bar, described as follows. + <H3>Overview</H3> + <BLOCKQUOTE> + <P/> + The <A HREF="overview-summary.html">Overview</A> page is the front + page of this TLD document and provides a list of all tag libraries + with a summary for each. + </BLOCKQUOTE> + <H3>Library</H3> + <BLOCKQUOTE> + <P/> + Each tag library has a page that contains a list of its + validator, listeners, tags, and functions, with a summary for each. + This page can contain four categories: + <UL> + <li>Validator</li> + <li>Listeners</li> + <li>Tags</li> + <li>Functions</li> + </UL> + </BLOCKQUOTE> + <H3>Validator</H3> + <BLOCKQUOTE> + <P/> + A tag library can have at most one validator. If a tag library + has a validator, it has its own page describing the validator, + the class that implements the validator, and the available + initialization parameters. + </BLOCKQUOTE> + <h3>Listeners</h3> + <blockquote> + <p/> + A tag library can have zero or more listeners. If a tag library + has at least one listener, a page is generated that lists all + listener classes registered for the tag library. + </blockquote> + <h3>Tags</h3> + <blockquote> + <p/> + A tag library can have zero or more tags. Each tag has its own + page that describes the tag, its display name, its unique action + name, the class that implements the tag, the TagExtraInfo class, + the body content type, scripting variable information, attributes, + whether the tag supports dynamic attributes, and an optional + example use of the tag. + </blockquote> + <h3>Functions</h3> + <blockquote> + <p/> + A tag library can contain zero or more EL functions. If a tag + library has at least one function, a page is generated that lists + all functions, the class that implements the function, the + function signature, and an optional example use of the function. + </blockquote> +  + <H3>Prev/Next</H3> + <blockquote> + These links take you to the next or previous validator, listener, + tag, function, or related page. + </blockquote> + <H3>Frames/No Frames</H3> + <blockquote> + These links show and hide the HTML frames. All pages are available + with or without frames. + </blockquote> + <BR/> + <HR/> + <a name="navbar_bottom"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_bottom_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1">  <a href="overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Library </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"><b>Help</b></font> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  PREV  +  NEXT  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="help-doc.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> + <HR/> + <small><i> + Output Generated by + <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>. + Java, JSP, and JavaServer Pages are trademarks or + registered trademarks of Sun Microsystems, Inc. in the US and other + countries. Copyright 2002-4 Sun Microsystems, Inc. + 4150 Network Circle + Santa Clara, CA 95054, U.S.A. + All Rights Reserved. + </i></small> + </BODY> + </HTML> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/index.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/index.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/index.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <html> + <head> + <title> + <xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/> + </title> + </head> + <frameset cols="20%,80%"> + <frameset rows="30%,70%"> + <frame src="overview-frame.html" name="tldListFrame"/> + <frame src="alltags-frame.html" name="tldFrame"/> + </frameset> + <frame src="overview-summary.html" name="tagFrame"/> + </frameset> + <noframes> + <h2>Frame Alert</h2> + <p/> + This document is designed to be viewed using the frames feature. + If you see this message, you are using a non-frame-capable web + client. + <br/> + Link to <a href="overview-summary.html">Non-frame version.</a> + </noframes> + </html> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-frame.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-frame.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-frame.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <html> + <head> + <title> + Overview (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </title> + <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/> + </head> + <script> + function asd() { + parent.document.title="Overview (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)"; + } + </script> + <body bgcolor="white" onload="asd();"> + <table border="0" width="100%"> + <tr> + <td nowrap="true"> + <font size="+1" class="FrameTitleFont"> + <b><xsl:value-of select="/javaee:tlds/javaee:config/javaee:doc-title"/></b> + </font> + </td> + </tr> + </table> + <table border="0" width="100%"> + <tr> + <td nowrap="true"> + <font class="FrameItemFont"> + <a href="alltags-frame.html" target="tldFrame"><xsl:text>All Tags / Attributes</xsl:text></a> + </font> + <p/> + <font size="+1" class="FrameHeadingFont"> + Tag Libraries + </font> + <br/> + <xsl:apply-templates select="javaee:tlds/javaee:taglib"/> + </td> + </tr> + </table> + <p/> + </body> + </html> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <font class="FrameItemFont"> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:short-name"/>/tld-frame.html</xsl:attribute> + <xsl:attribute name="target">tldFrame</xsl:attribute> + <xsl:choose> + <xsl:when test="javaee:display-name!=''"> + <xsl:value-of select="javaee:display-name"/> + </xsl:when> + <xsl:when test="javaee:short-name!=''"> + <xsl:value-of select="javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:element> + </font> + <br/> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-summary.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-summary.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/overview-summary.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,208 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:template match="/"> + <html> + <head> + <title> + Overview (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </title> + <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/> + </head> + <script> + function asd() { + parent.document.title="Overview (<xsl:value-of select="normalize-space(/javaee:tlds/javaee:config/javaee:window-title)"/>)"; + } + </script> + <body bgcolor="white" onload="asd();"> +  + <a name="navbar_top"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_top_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <font CLASS="NavBarFont1Rev"><b> Overview </b></font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Library </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="overview-summary.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + <hr/> + <center> + <h2><xsl:value-of select="/javaee:tlds/javaee:config/javaee:doc-title"/></h2> + </center> + <table BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%"> + <tr BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> + <td COLSPAN="2"><font SIZE="+2"> + <b>Tag Libraries</b> + </font></td> + </tr> + <xsl:apply-templates select="/javaee:tlds/javaee:taglib"/> + </table> + <p/> + <hr/> +  + <a name="navbar_bottom"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_bottom_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <font CLASS="NavBarFont1Rev"><b> Overview </b></font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Library </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="overview-summary.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + <hr/> + <small><i> + Output Generated by + <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>. + Java, JSP, and JavaServer Pages are trademarks or + registered trademarks of Sun Microsystems, Inc. in the US and other + countries. Copyright 2002-4 Sun Microsystems, Inc. + 4150 Network Circle + Santa Clara, CA 95054, U.S.A. + All Rights Reserved. + </i></small> + </body> + </html> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <tr BGCOLOR="white" valign="top" CLASS="TableRowColor"> + <td WIDTH="20%"><b> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:short-name"/>/tld-summary.html</xsl:attribute> + <xsl:choose> + <xsl:when test="javaee:display-name!=''"> + <xsl:value-of select="javaee:display-name"/> + </xsl:when> + <xsl:when test="javaee:short-name!=''"> + <xsl:value-of select="javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:element> + </b></td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <pre> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </pre> + </xsl:when> + <xsl:otherwise> + <i>No Description</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/stylesheet.css =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/stylesheet.css (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/stylesheet.css 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,60 @@ +/* Javadoc style sheet */ + +/* + * <license> + * Copyright (c) 2003-2004, Sun Microsystems, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * ROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * </license> + */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { background-color: #FFFFFF } + +/* Table colors */ +.TableHeadingColor { background: #CCCCFF } /* Dark mauve */ +.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */ +.TableRowColor { background: #FFFFFF } /* White */ + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } +.FrameHeadingFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } +.FrameItemFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#EEEEFF;}/* Light mauve */ +.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */ +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tag.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tag.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tag.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,474 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + + <xsl:param name="tlddoc-shortName">default</xsl:param> + <xsl:param name="tlddoc-tagName">default</xsl:param> + +  + <xsl:template match="/"> + <xsl:apply-templates select="javaee:tlds/javaee:taglib"/> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <xsl:if test="javaee:short-name=$tlddoc-shortName"> + <xsl:apply-templates select="javaee:tag|javaee:tag-file"/> + </xsl:if> + </xsl:template> + + <xsl:template match="javaee:tag|javaee:tag-file"> + <xsl:if test="javaee:name=$tlddoc-tagName"> + <xsl:variable name="tldname"> + <xsl:choose> + <xsl:when test="../javaee:display-name!=''"> + <xsl:value-of select="../javaee:display-name"/> + </xsl:when> + <xsl:when test="../javaee:short-name!=''"> + <xsl:value-of select="../javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="title"> + <xsl:value-of select="javaee:name"/> + (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </xsl:variable> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <meta name="keywords" content="$title"/> + <link rel="stylesheet" type="text/css" href="../stylesheet.css" + title="Style"/> + </head> + <script> + function asd() + { + parent.document.title="<xsl:value-of select="normalize-space($title)"/>"; + } + </script> + <body bgcolor="white" onload="asd();"> +  + <a name="navbar_top"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_top_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Tag </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:attribute name="target">_top</xsl:attribute> + <b>NO FRAMES</b> + </xsl:element>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + + <hr/> + <h2><font size="-1"><xsl:value-of select="$tldname"/></font><br/> + <xsl:call-template name="getTagName"> + <xsl:with-param name="tagName" select="string(javaee:name)" /> + </xsl:call-template> + </h2> + <hr/> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/><br/> + <p/> + <xsl:if test="javaee:example!=''"> + <b>Example:</b><br/> + <pre> +<xsl:value-of select="javaee:example"/> + </pre> + <p/> + </xsl:if> + <hr/> + +  +  + +  + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td colspan="5"> + <font size="+2"> + <b>Attributes</b> + </font> + </td> + </tr> + <xsl:choose> + <xsl:when test="count(javaee:attribute)>0"> + <tr> + <td><b>Name</b></td> + <td><b>Required</b></td> + <td><b>Request-time</b></td> + <td><b>Type</b></td> + <td><b>Description</b></td> + </tr> + <xsl:apply-templates select="javaee:attribute"/> + </xsl:when> + <xsl:otherwise> + <td colspan="5"><i>No Attributes Defined.</i></td> + </xsl:otherwise> + </xsl:choose> + </table> + <br/> + <p/> + +  +  + +  + <a name="navbar_bottom"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_bottom_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="tld-summary.html"><font CLASS="NavBarFont1"><b>Library</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Tag </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:attribute name="target">_top</xsl:attribute> + <b>NO FRAMES</b> + </xsl:element>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + <hr/> + <small><i> + Output Generated by + <a href="http://taglibrarydoc.dev.java.net/" target="_blank">Tag Library Documentation Generator</a>. + Java, JSP, and JavaServer Pages are trademarks or + registered trademarks of Sun Microsystems, Inc. in the US and other + countries. Copyright 2002-4 Sun Microsystems, Inc. + 4150 Network Circle + Santa Clara, CA 95054, U.S.A. + All Rights Reserved. + </i></small> + </body> + </html> + </xsl:if> + </xsl:template> + + <xsl:template match="javaee:attribute"> + <tr valign="top"> + <td><xsl:apply-templates select="javaee:name"/></td> + <td> + <xsl:choose> + <xsl:when test="javaee:required!=''"> + <xsl:value-of select="javaee:required"/> + </xsl:when> + <xsl:otherwise>false</xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:rtexprvalue!=''"> + <xsl:value-of select="javaee:rtexprvalue"/> + </xsl:when> + <xsl:otherwise>false</xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:deferred-value"> + <xsl:choose> + <xsl:when test="javaee:deferred-value/javaee:type"> + <code>javax.el.ValueExpression</code> + <br/>(<i>must evaluate to </i><code><xsl:value-of + select="javaee:deferred-value/javaee:type"/></code>) + </xsl:when> + <xsl:otherwise> + <code>javax.el.ValueExpression</code> + <br/>(<i>must evaluate to </i><code>java.lang.Object</code>) + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:when test="javaee:deferred-method"> + <xsl:choose> + <xsl:when test="javaee:deferred-method/javaee:method-signature"> + <code>javax.el.MethodExpression</code> + <br/>(<i>signature must match </i><code><xsl:value-of + select="javaee:deferred-method/javaee:method-signature"/></code>) + </xsl:when> + <xsl:otherwise> + <code>javax.el.MethodExpression</code> + <br/>(<i>signature must match </i><code>void methodname()</code>) + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:when test="javaee:type!=''"> + <code><xsl:value-of select="javaee:type"/></code> + </xsl:when> + <xsl:otherwise> + <code>java.lang.String</code> + </xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </xsl:when> + <xsl:otherwise><i>No Description</i></xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> + + <xsl:template match="javaee:variable"> + <tr> + <td> + <xsl:choose> + <xsl:when test="javaee:name-given!=''"> + <xsl:value-of select="javaee:name-given"/> + </xsl:when> + <xsl:when test="javaee:name-from-attribute!=''"> + <i>From attribute '<xsl:value-of select="javaee:name-from-attribute"/>'</i> + </xsl:when> + <xsl:otherwise> + <i>Unknown</i> + </xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:variable-class!=''"> + <code><xsl:value-of select="javaee:variable-class"/></code> + </xsl:when> + <xsl:otherwise><code>java.lang.String</code></xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:declare!=''"> + <xsl:value-of select="javaee:declare"/> + </xsl:when> + <xsl:otherwise>true</xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:scope!=''"> + <xsl:value-of select="javaee:scope"/> + </xsl:when> + <xsl:otherwise>NESTED</xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </xsl:when> + <xsl:otherwise><i>No Description</i></xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> + + <xsl:template name="getTagName"> + <xsl:param name="tagName" /> + <xsl:choose> + <xsl:when test="$tagName = '_global_attributes'"> + Global attributes + </xsl:when> + <xsl:otherwise> + Tag <xsl:value-of select="$tagName" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-frame.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-frame.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-frame.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,206 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + + <xsl:param name="tlddoc-shortName">default</xsl:param> + +  + <xsl:template match="/"> + <xsl:apply-templates select="javaee:tlds/javaee:taglib"/> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <xsl:if test="javaee:short-name=$tlddoc-shortName"> + <xsl:variable name="tldname"> + <xsl:choose> + <xsl:when test="javaee:display-name!=''"> + <xsl:value-of select="javaee:display-name"/> + </xsl:when> + <xsl:when test="javaee:short-name!=''"> + <xsl:value-of select="javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="tldfull"> + <xsl:value-of select="$tldname"/> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + (<xsl:value-of select="javaee:description" disable-output-escaping="yes"/>) + </xsl:when> + <xsl:otherwise> + No Description + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <html> + <head> + <title> + <xsl:value-of select="$tldfull"/> + </title> + <meta name="keywords" content="$tldfull"/> + <link rel="stylesheet" type="text/css" href="../stylesheet.css" + title="Style"/> + <script> + function asd() + { + parent.document.title="<xsl:value-of select="normalize-space($tldfull)"/>"; + } + </script> + </head> + <body bgcolor="white" onload="asd();"> + <font size="+1" class="FrameTitleFont"> + <a href="tld-summary.html" target="tagFrame"> + <xsl:value-of select="$tldname"/> + </a> + </font> + <table border="0" width="100%"> + <xsl:if test="(count(javaee:tag)+count(javaee:tag-file))>0"> + <tr> + <td nowrap="true"> + <font size="+1" class="FrameHeadingFont"> + Tags / Attributes + </font>  + <font class="FrameItemFont"> + <xsl:apply-templates select="javaee:tag|javaee:tag-file"> + <xsl:sort select="../javaee:short-name"/> + <xsl:sort select="javaee:name"/> + </xsl:apply-templates> + </font> + </td> + </tr> + </xsl:if> + <xsl:if test="count(javaee:function)>0"> + <tr> + <td nowrap="true"> + <font size="+1" class="FrameHeadingFont"> + Functions + </font>  + <font class="FrameItemFont"> + <xsl:apply-templates select="javaee:function"/> + </font> + </td> + </tr> + </xsl:if> + <xsl:if test="count(javaee:validator)>0"> + <tr> + <td nowrap="true"> + <font size="+1" class="FrameHeadingFont"> + Validator + </font>  + <font class="FrameItemFont"> + <xsl:apply-templates select="javaee:validator"/> + </font> + </td> + </tr> + </xsl:if> + <xsl:if test="count(javaee:listener)>0"> + <tr> + <td nowrap="true"> + <font size="+1" class="FrameHeadingFont"> + Listeners + </font>  + <font class="FrameItemFont"> + <xsl:apply-templates select="javaee:listener"/> + </font> + </td> + </tr> + </xsl:if> + </table> +  + </body> + </html> + </xsl:if> + </xsl:template> + + <xsl:template match="javaee:tag|javaee:tag-file"> + <br/> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:attribute name="target">tagFrame</xsl:attribute> + <xsl:value-of select="../javaee:short-name"/>: + <xsl:call-template name="getTagName"> + <xsl:with-param name="tagName" select="string(javaee:name)" /> + </xsl:call-template> + </xsl:element> + </xsl:template> + + <xsl:template name="getTagName"> + <xsl:param name="tagName" /> + <xsl:choose> + <xsl:when test="$tagName = '_global_attributes'"> + @* + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tagName" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="javaee:function"> + <br/> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:attribute name="target">tagFrame</xsl:attribute> + <i><xsl:value-of select="../javaee:short-name"/>:<xsl:value-of select="javaee:name"/>()</i> + </xsl:element> + </xsl:template> + + <xsl:template match="javaee:validator"> + <br/> + <xsl:value-of select="javaee:validator-class"/> + </xsl:template> + + <xsl:template match="javaee:listener"> + <br/> + <xsl:value-of select="javaee:listener-class"/> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-summary.html.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-summary.html.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld-summary.html.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,466 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <xsl:output method="html" indent="yes"/> + + <xsl:param name="tlddoc-shortName">default</xsl:param> + +  + <xsl:template match="/"> + <xsl:apply-templates select="javaee:tlds/javaee:taglib"/> + </xsl:template> + + <xsl:template match="javaee:taglib"> + <xsl:if test="javaee:short-name=$tlddoc-shortName"> + <xsl:variable name="tldname"> + <xsl:choose> + <xsl:when test="javaee:display-name!=''"> + <xsl:value-of select="javaee:display-name"/> + </xsl:when> + <xsl:when test="javaee:short-name!=''"> + <xsl:value-of select="javaee:short-name"/> + </xsl:when> + <xsl:otherwise> + Unnamed TLD + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="title"> + <xsl:value-of select="$tldname"/> + (<xsl:value-of select="/javaee:tlds/javaee:config/javaee:window-title"/>) + </xsl:variable> + <html> + <head> + <title><xsl:value-of select="$title"/></title> + <link rel="stylesheet" type="text/css" href="../stylesheet.css" + title="styie"/> + </head> + <script> + function asd() + { + parent.document.title="<xsl:value-of select="normalize-space($title)"/>"; + } + </script> + <body bgcolor="white" onload="asd();"> +  + <a name="navbar_top"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_top_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Library </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="tld-summary.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + + <hr/> + <h2><xsl:value-of select="$tldname"/></h2> + <hr/> + <xsl:if test="(javaee:uri!='') and (javaee:short-name!='')"> +  + <b>XML Syntax:</b><br/> + <code> +      + <xsl:choose> + <xsl:when test='starts-with(javaee:uri,"/WEB-INF/tags")'> + <anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="urn:jsptagdir:<xsl:value-of select="javaee:uri"/>" /><br/> + </xsl:when> + <xsl:when test='starts-with(javaee:uri,"/")'> + <anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="urn:jsptld:<xsl:value-of select="javaee:uri"/>" /><br/> + </xsl:when> + <xsl:otherwise> + <anyxmlelement xmlns:<xsl:value-of select="javaee:short-name"/>="<xsl:value-of select="javaee:uri"/>" /><br/> + </xsl:otherwise> + </xsl:choose> + </code> + <hr/> + </xsl:if> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <pre> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </pre> + </xsl:when> + <xsl:otherwise> + No Description + </xsl:otherwise> + </xsl:choose> + <p/> +  +  + <xsl:if test="(count(javaee:tag)+count(javaee:tag-file)) > 0"> + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td colspan="2"> + <font size="+2"><b>Summary</b></font> + </td> + </tr> + <xsl:apply-templates select="javaee:tag|javaee:tag-file"> + <xsl:sort select="../javaee:short-name"/> + <xsl:sort select="javaee:name"/> + </xsl:apply-templates> + </table> +   + <p/> + </xsl:if> +  + <xsl:if test="count(javaee:function) > 0"> + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td colspan="3"> + <font size="+2"><b>Function Summary</b></font> + </td> + </tr> + <xsl:apply-templates select="javaee:function"/> + </table> +   + <p/> + </xsl:if> +  + <xsl:if test="count(javaee:validator) > 0"> + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td colspan="2"> + <font size="+2"><b>Tag Library Validator</b></font> + </td> + </tr> + <xsl:apply-templates select="javaee:validator"/> + </table> +   + <p/> + </xsl:if> +  + <xsl:if test="count(javaee:listener) > 0"> + <table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr bgcolor="#CCCCFF" class="TableHeadingColor"> + <td> + <font size="+2"><b>Listeners</b></font> + </td> + </tr> + <xsl:apply-templates select="javaee:listener"/> + </table> +   + <p/> + </xsl:if> +  + +  + <a name="navbar_bottom"></a> + <table border="0" width="100%" cellpadding="1" cellspacing="0"> + <tr> + <td COLSPAN="3" BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> + <a NAME="navbar_bottom_firstrow"></a> + <table BORDER="0" CELLPADDING="0" CELLSPACING="3"> + <tr ALIGN="center" VALIGN="top"> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a href="../overview-summary.html"><font CLASS="NavBarFont1"><b>Overview</b></font></a> </td> + <td BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev">  <font CLASS="NavBarFont1Rev"> Library </font> </td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <font CLASS="NavBarFont1"> Tag </font></td> + <td BGCOLOR="#EEEEFF" CLASS="NavBarCell1">  <a HREF="../help-doc.html"><font CLASS="NavBarFont1"><b>Help</b></font></a> </td> + </tr> + </table> + </td> + <td ALIGN="right" VALIGN="top" ROWSPAN="3"><em> + </em> + </td> + </tr> + <tr> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  +  + </font></td> + <td BGCOLOR="white" CLASS="NavBarCell2"><font SIZE="-2"> +  <a HREF="../index.html" TARGET="_top"><b>FRAMES</b></a>  +  <a HREF="tld-summary.html" TARGET="_top"><b>NO FRAMES</b></a>  + <script> +  + </script> + <noscript> + <a HREF="../alltags-noframe.html" TARGET=""><b>All Tags</b></a> + </noscript> + </font></td> + </tr> + </table> +  + <hr/> + <small><i> + Java, JSP, and JavaServer Pages are trademarks or registered + trademarks of Sun Microsystems, Inc. in the US and other countries. + Copyright 2002-3 Sun Microsystems, Inc. + 4150 Network Circle + Santa Clara, CA 95054, U.S.A. + All Rights Reserved. + </i></small> + </body> + </html> + </xsl:if> + </xsl:template> + + <xsl:template match="javaee:tag|javaee:tag-file"> + <tr bgcolor="white" class="TableRowColor"> + <td width="15%"> + <b> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.html</xsl:attribute> + <xsl:call-template name="getTagName"> + <xsl:with-param name="tagName" select="string(javaee:name)" /> + </xsl:call-template> + </xsl:element> + </b> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </xsl:when> + <xsl:otherwise> + <i>No Description</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> + + <xsl:template name="getTagName"> + <xsl:param name="tagName" /> + <xsl:choose> + <xsl:when test="$tagName = '_global_attributes'"> + @* + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$tagName" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="javaee:function"> + <tr bgcolor="white" class="TableRowColor"> + <td width="15%" nowrap="" align="right"> + <code><xsl:value-of select='substring-before(normalize-space(javaee:function-signature)," ")'/></code> + </td> + <td width="15%" nowrap=""> + <code><b> + <xsl:element name="a"> + <xsl:attribute name="href"><xsl:value-of select="javaee:name"/>.fn.html</xsl:attribute> + <xsl:value-of select="javaee:name"/> + </xsl:element> + </b>( <xsl:value-of select='substring-after(normalize-space(javaee:function-signature),"(")'/> + </code> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </xsl:when> + <xsl:otherwise> + <i>No Description</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> + + <xsl:template match="javaee:validator"> + <tr valign="top" bgcolor="white" class="TableRowColor"> + <td width="15%"> + <b><xsl:value-of select="javaee:validator-class"/></b> + </td> + <td> + <xsl:choose> + <xsl:when test="javaee:description!=''"> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + </xsl:when> + <xsl:otherwise> + <i>No Description</i> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="count(javaee:init-param)>0"> + <blockquote> + <b>Initialization Parameters:</b><br/> + <table border="1"> + <tr> + <td><b>Name</b></td> + <td><b>Value</b></td> + <td><b>Description</b></td> + </tr> + <xsl:apply-templates select="javaee:init-param"/> + </table> + </blockquote> + </xsl:if> + </td> + </tr> + </xsl:template> + + <xsl:template match="javaee:init-param"> + <tr valign="top"> + <td><xsl:value-of select="javaee:param-name"/></td> + <td><xsl:value-of select="javaee:param-value"/></td> + <td> + <xsl:choose> + <xsl:when test="javaee:param-description!=''"> + <xsl:value-of select="javaee:param-description"/> + </xsl:when> + <xsl:otherwise> + <i>No Description</i> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </xsl:template> + + <xsl:template match="javaee:listener"> + <tr valign="top" bgcolor="white" class="TableRowColor"> + <td> + <b><xsl:value-of select="javaee:listener-class"/></b> + </td> + </tr> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_1-tld1_2.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_1-tld1_2.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_1-tld1_2.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="xml" indent="yes" + doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" + doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"/> + + <xsl:template match="/taglib"> + <taglib> + <xsl:apply-templates select="tlibversion"/> + <jsp-version>1.2</jsp-version> + <xsl:apply-templates select="shortname"/> + <xsl:apply-templates select="uri"/> + <xsl:apply-templates select="info"/> + <xsl:apply-templates select="tag"/> + </taglib> + </xsl:template> + +  + <xsl:template match="tlibversion"> + <tlib-version><xsl:apply-templates/></tlib-version> + </xsl:template> + +  + <xsl:template match="jspversion"> + <jsp-version><xsl:apply-templates/></jsp-version> + </xsl:template> + +  + <xsl:template match="shortname"> + <short-name><xsl:apply-templates/></short-name> + </xsl:template> + +  + <xsl:template match="uri"> + <uri><xsl:apply-templates/></uri> + </xsl:template> + +  + <xsl:template match="info"> + <description><xsl:apply-templates/></description> + </xsl:template> + + <xsl:template match="tag"> + <tag> + <xsl:apply-templates select="name"/> + <xsl:apply-templates select="tagclass"/> + <xsl:apply-templates select="teiclass"/> + <xsl:apply-templates select="bodycontent"/> + <xsl:apply-templates select="info"/> + <xsl:apply-templates select="attribute"/> + </tag> + </xsl:template> + +  + <xsl:template match="name"> + <name><xsl:apply-templates/></name> + </xsl:template> + +  + <xsl:template match="tagclass"> + <tag-class><xsl:apply-templates/></tag-class> + </xsl:template> + +  + <xsl:template match="teiclass"> + <tei-class><xsl:apply-templates/></tei-class> + </xsl:template> + +  + <xsl:template match="bodycontent"> + <body-content><xsl:apply-templates/></body-content> + </xsl:template> + +  + <xsl:template match="info"> + <description><xsl:apply-templates/></description> + </xsl:template> + +  + <xsl:template match="attribute"> + <attribute> + <xsl:apply-templates/> + </attribute> + </xsl:template> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_2-tld2_0.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_2-tld2_0.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld1_2-tld2_0.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,290 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="xml" indent="yes"/> + + <xsl:template match="/taglib"> + <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/j2ee"> + <xsl:attribute name="xsi:schemaLocation" namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</xsl:attribute> + <xsl:attribute name="version">2.0</xsl:attribute> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="display-name"/> + <xsl:if test="small-icon|large-icon"> + <icon xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="small-icon"/> + <xsl:apply-templates select="large-icon"/> + </icon> + </xsl:if> + <xsl:apply-templates select="tlib-version"/> + <xsl:apply-templates select="short-name"/> + <xsl:apply-templates select="uri"/> + <xsl:apply-templates select="validator"/> + <xsl:apply-templates select="listener"/> + <xsl:apply-templates select="tag"/> + </xsl:element> + </xsl:template> + +  + <xsl:template match="description"> + <description xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </description> + </xsl:template> + +  + <xsl:template match="display-name"> + <display-name xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </display-name> + </xsl:template> + +  + <xsl:template match="tlib-version"> + <tlib-version xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </tlib-version> + </xsl:template> + +  + <xsl:template match="short-name"> + <short-name xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </short-name> + </xsl:template> + +  + <xsl:template match="uri"> + <uri xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </uri> + </xsl:template> + + <xsl:template match="validator"> + <validator xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="validator-class"/> + <xsl:apply-templates select="init-param"/> + </validator> + </xsl:template> + + <xsl:template match="init-param"> + <init-param xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="param-name"/> + <xsl:apply-templates select="param-value"/> + </init-param> + </xsl:template> + +  + <xsl:template match="param-name"> + <param-name xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </param-name> + </xsl:template> + +  + <xsl:template match="param-value"> + <param-value xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </param-value> + </xsl:template> + +  + <xsl:template match="listener"> + <listener xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="listener-class"/> + </listener> + </xsl:template> + +  + <xsl:template match="listener-class"> + <listener-class xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </listener-class> + </xsl:template> + + <xsl:template match="tag"> + <tag xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="display-name"/> + <xsl:if test="small-icon|large-icon"> + <icon xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="small-icon"/> + <xsl:apply-templates select="large-icon"/> + </icon> + </xsl:if> + <xsl:apply-templates select="name"/> + <xsl:apply-templates select="tag-class"/> + <xsl:apply-templates select="tei-class"/> + <xsl:choose> + <xsl:when test="body-content"> + <xsl:apply-templates select="body-content"/> + </xsl:when> + <xsl:otherwise> +  + <body-content xmlns="http://java.sun.com/xml/ns/j2ee">JSP</body-content> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="variable"/> + <xsl:apply-templates select="attribute"/> + <xsl:apply-templates select="example"/> + </tag> + </xsl:template> + +  + <xsl:template match="name"> + <name xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </name> + </xsl:template> + +  + <xsl:template match="tag-class"> + <tag-class xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </tag-class> + </xsl:template> + +  + <xsl:template match="tei-class"> + <tei-class xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </tei-class> + </xsl:template> + +  + <xsl:template match="body-content"> + <body-content xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </body-content> + </xsl:template> + + <xsl:template match="variable"> + <variable xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="name-given"/> + <xsl:apply-templates select="name-from-attribute"/> + <xsl:apply-templates select="variable-class"/> + <xsl:apply-templates select="declare"/> + <xsl:apply-templates select="scope"/> + </variable> + </xsl:template> + + <xsl:template match="attribute"> + <attribute xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates select="description"/> + <xsl:apply-templates select="name"/> + <xsl:apply-templates select="required"/> + <xsl:apply-templates select="rtexprvalue"/> + <xsl:apply-templates select="type"/> + </attribute> + </xsl:template> + +  + <xsl:template match="required"> + <required xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </required> + </xsl:template> + +  + <xsl:template match="rtexprvalue"> + <rtexprvalue xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </rtexprvalue> + </xsl:template> + +  + <xsl:template match="example"> + <example xmlns="http://java.sun.com/xml/ns/j2ee"> + <xsl:apply-templates/> + </example> + </xsl:template> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_0-tld2_1.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_0-tld2_1.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_0-tld2_1.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"> + <xsl:output method="xml" indent="yes"/> + + <xsl:template match="/j2ee:taglib"> + <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/javaee"> + <xsl:attribute name="xsi:schemaLocation" namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd</xsl:attribute> + <xsl:attribute name="version">2.1</xsl:attribute> + <xsl:apply-templates select="*"/> + </xsl:element> + </xsl:template> + + <xsl:template match="j2ee:*"> + <xsl:element name="{local-name()}" namespace="http://java.sun.com/xml/ns/javaee"> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:element> + </xsl:template> + +</xsl:stylesheet> Added: root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_1-tld2_1.xsl =================================================================== --- root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_1-tld2_1.xsl (rev 0) +++ root/cdk-sandbox/trunk/xsd2javadoc/src/main/xslt/tlddoc/tld2_1-tld2_1.xsl 2010-02-17 12:47:39 UTC (rev 16466) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + + + + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + <xsl:output method="xml" indent="yes"/> + + <xsl:template match="/javaee:taglib"> + <xsl:element name="taglib" namespace="http://java.sun.com/xml/ns/javaee"> + <xsl:attribute name="xsi:schemaLocation" + namespace="http://www.w3.org/2001/XMLSchema-instance">http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd</xsl:attribute> + <xsl:attribute name="version">2.1</xsl:attribute> + <xsl:apply-templates select="*"/> + </xsl:element> + </xsl:template> + + <xsl:template match="javaee:tag-extension"> + </xsl:template> + + <xsl:template match="javaee:function-extension"> + </xsl:template> + + <xsl:template match="javaee:taglib-extension"> + </xsl:template> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="text()"> + <xsl:value-of select="normalize-space(.)" /> + </xsl:template> + +</xsl:stylesheet>

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16465 - branches/community/3.3.X/docs.

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

Author: SeanRogers Date: 2010-02-16 23:42:26 -0500 (Tue, 16 Feb 2010) New Revision: 16465 Removed: branches/community/3.3.X/docs/richfaces_3.3.3.cr1_docs.zip Log: Removed zip now it is uploaded Deleted: branches/community/3.3.X/docs/richfaces_3.3.3.cr1_docs.zip =================================================================== (Binary files differ)

14 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r16464 - branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource.

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

Author: alexsmirnov Date: 2010-02-16 18:49:58 -0500 (Tue, 16 Feb 2010) New Revision: 16464 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/StaticResource.java Log: https://jira.jboss.org/jira/browse/JBSEAM-4543, JBIDE-4500 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2010-02-16 23:12:41 UTC (rev 16463) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2010-02-16 23:49:58 UTC (rev 16464) @@ -30,7 +30,9 @@ import java.io.StreamCorruptedException; import java.io.StringReader; import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; import java.net.URL; +import java.net.URLConnection; import java.util.Collections; import java.util.Date; import java.util.Enumeration; @@ -443,21 +445,19 @@ throws ResourceNotFoundException, FacesException { FacesContext context = FacesContext.getCurrentInstance(); if (null != context) { - if (context.getExternalContext().getContext() instanceof ServletContext) { - ServletContext servletContext = (ServletContext) context - .getExternalContext().getContext(); - InputStream in = servletContext.getResourceAsStream(path); + try { + URL in = context.getExternalContext().getResource(path); if (null != in) { InternetResourceBase res = new StaticResource(path); setRenderer(res, path); + // Detect last modification time. res.setLastModified(new Date(getStartTime())); addResource(path, res); - try { - in.close(); - } catch (IOException e) { - } return res; } + } catch (MalformedURLException e) { + throw new ResourceNotFoundException(Messages.getMessage( + Messages.STATIC_RESOURCE_NOT_FOUND_ERROR, path),e); } } throw new ResourceNotFoundException(Messages.getMessage( Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/StaticResource.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/StaticResource.java 2010-02-16 23:12:41 UTC (rev 16463) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/resource/StaticResource.java 2010-02-16 23:49:58 UTC (rev 16464) @@ -22,11 +22,17 @@ package org.ajax4jsf.resource; import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Date; import javax.faces.context.FacesContext; import org.ajax4jsf.resource.ResourceContext; +import com.sun.facelets.FaceletException; + /** * @author asmirnov(a)exadel.com (latest modification by $Author: nick_belaevski $) * @version $Revision: 1.1.2.2 $ $Date: 2007/01/11 16:52:14 $ @@ -52,6 +58,27 @@ } + @Override + public Date getLastModified(ResourceContext resourceContext) { + InputStream is = null; + try { + URL url = resourceContext.getResource(path); + URLConnection conn = url.openConnection(); + is = conn.getInputStream(); + long atl = conn.getLastModified(); + return new Date(atl); + } catch (Exception e) { + return super.getLastModified(resourceContext); + } finally { + if (is != null) { + try { + is.close(); + } catch (Exception e) { + // do nothing + } + } + } + } /* (non-Javadoc) * @see org.ajax4jsf.resource.InternetResourceBase#getResourceAsStream(javax.faces.context.FacesContext, javax.faces.component.UIComponent) @@ -71,11 +98,11 @@ - public String getUri(FacesContext context, Object data) { - // perform all encodings, suitable for JSF specification. - String src = context.getApplication().getViewHandler().getResourceURL(context,path); - return context.getExternalContext().encodeResourceURL(src); - } +// public String getUri(FacesContext context, Object data) { +// // perform all encodings, suitable for JSF specification. +// String src = context.getApplication().getViewHandler().getResourceURL(context,path); +// return context.getExternalContext().encodeResourceURL(src); +// }

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2010