richfaces-svn-commits
August 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 708 discussions
JBoss Rich Faces SVN: r2287 - trunk/docs.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-16 06:57:29 -0400 (Thu, 16 Aug 2007)
New Revision: 2287
Removed:
trunk/docs/ajaxguide/
Log:
The guide was merged with RF guide
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2286 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-16 06:51:40 -0400 (Thu, 16 Aug 2007)
New Revision: 2286
Modified:
trunk/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
trunk/docs/userguide/en/src/main/docbook/included/push.xml
trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
trunk/docs/userguide/en/src/main/docbook/included/tree.xml
trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
Log:
http://jira.jboss.com/jira/browse/RF-398
some spelling mistakes were corrected
Modified: trunk/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -2,7 +2,7 @@
<section>
<para>The <emphasis role="bold">
<property><a4j:actionparam></property>
- </emphasis> component combines the functionalityity of both JSF components: <emphasis role="bold">
+ </emphasis> component combines the functionality of both JSF components: <emphasis role="bold">
<property><f:param></property>
</emphasis> and <emphasis role="bold">
<property><f:actionListener></property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -7,7 +7,7 @@
</sectioninfo>
<section>
<title>Description</title>
- <para>The component designed for providing the functionalityity of tables scrolling using AJAX
+ <para>The component designed for providing the functionality of tables scrolling using AJAX
requests.</para>
<figure>
<title>Datascroller component</title>
@@ -23,7 +23,7 @@
<itemizedlist>
<listitem>
- <para>Provides table scrolling functionalityity</para>
+ <para>Provides table scrolling functionality</para>
</listitem>
<listitem>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -75,7 +75,7 @@
<title>Details of Usage</title>
<para>The <emphasis role="bold">
<property><rich:Datascroller></property>
- </emphasis> component provides table scrolling functionalityity the same as tomahawk scroller but
+ </emphasis> component provides table scrolling functionality the same as tomahawk scroller but
with Ajax requests usage.</para>
<para>The component should be placed into footer of the parent table or be bound to it with the <emphasis>
<property>"for"</property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -85,7 +85,7 @@
<para><property>dndParam</property> is used during drag-and-drop
operations to pass parameters to an indicator. At first, a parameter type
- is defined with the type attribute (to specify parameter functionalityity),
+ is defined with the type attribute (to specify parameter functionality),
then a parameter name could be defined with the name and value attribute.
Although, it's possible to use nested content defined inside
<property>dndParam</property> for value definition, instead of the
Modified: trunk/docs/userguide/en/src/main/docbook/included/push.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/push.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/push.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -51,7 +51,7 @@
<para>The main difference between <emphasis role="bold"><property><a4j:push></property></emphasis>and
<emphasis role="bold"><property><a4j:poll></property></emphasis> components
is that <emphasis role="bold"><property><a4j:push></property></emphasis> makes request to minimal code only (not to JSF tree) in order to check the presence of messages in the queue.
- If the message exists the complete request will be performed.
+ If a message exists, a complete request will be performed.
The component doesn't poll registered beans but registers EventListener which receives messages about events.
</para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -90,7 +90,7 @@
<title>Note:</title>
<para>The <emphasis role="bold">
<property><a4j:repeater></property>
- </emphasis> component is defined as fully updated, but really updated there are only the strings which rowKeys are included into the set <emphasis >
+ </emphasis> component is defined as fully updated, but really updated there are only the strings which rowKeys includes into the set <emphasis >
<property>"ajaxRowSet"</property>
</emphasis> defined in the <emphasis >
<property>"ajaxKeys"</property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -103,7 +103,7 @@
</section>
<section>
<title>Look-and-Feel Customization</title>
- <para>For skinnability implementation the components use a <emphasis
+ <para>For skinnability implementation, the components use a <emphasis
><property>style class redefinition method</property></emphasis>.</para>
<para>Default style classes are mapped on <emphasis
><property>skin parameters</property>.</emphasis></para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -86,7 +86,7 @@
<property>"initialState"</property>
</emphasis> attribute, where a facet name that is shown at first is defined.</para>
<note><title>Note:</title> It's also possible to define an
- <property>"empty"</property> facet to implement the functionalityity as
+ <property>"empty"</property> facet to implement the functionality as
drop-down panels have and make the facet active when no content is required to be rendered.</note>
<para>Switching mode could be defined with the <emphasis>
<property>"switchType"</property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -75,7 +75,7 @@
bar with possibility to group, arrange on the both bar sides, and place predefined separators
between them.</para>
<para>Grouping and an input side definition is described for <property>toolBarGroup</property>
- that defines this functionalityity.</para>
+ that defines this functionality.</para>
<para>Separators are located between components with the help of the <emphasis>
<property>"itemSeparator"</property>
</emphasis> attribute with four predefined values:</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -162,7 +162,7 @@
</section>
<section>
<title>Built-In Drag and Drop</title>
- <para>The tree component functionalityity provides a built-in support for Drag and Drop
+ <para>The tree component functionality provides a built-in support for Drag and Drop
operations. The main usage principles are the same as for Rich Faces Drag and Drop wrapper
components. Hence, to get additional information on the topic, read the corresponding
chapters:<link linkend="dndParam">"rich:dndParam"</link>
Modified: trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -7,7 +7,7 @@
</sectioninfo>
<section>
<title>Description</title>
- <para>The component that presents the Microsoft <property>Virtual Earth map</property> in the JSF applications.</para>
+ <para>It's the component that presents the Microsoft <property>Virtual Earth map</property> in the JSF applications.</para>
<figure>
<title>virtualEarth component</title>
<mediaobject>
@@ -20,7 +20,7 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Presents the Microsoft <property>Virtual Earth map</property> functionalityity</listitem>
+ <listitem>Presents the Microsoft <property>Virtual Earth map</property> functionality</listitem>
<listitem>Highly customizable via attributes</listitem>
<listitem>No developers JavaScript writing is needed to use it on the pages</listitem>
</itemizedlist>
Modified: trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2007-08-16 09:27:48 UTC (rev 2285)
+++ trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2007-08-16 10:51:40 UTC (rev 2286)
@@ -145,7 +145,7 @@
<section>
<title>Relevant resources links</title>
<para>
- <ulink url="http://msdn2.microsoft.com/en-us/library/bb429619.aspx">Here</ulink> you can found
+ <ulink url="http://msdn2.microsoft.com/en-us/library/bb429619.aspx">Here</ulink> you can found additional
information about Microsoft <property>Virtual Earth map</property>.</para>
</section>
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2285 - trunk/framework/impl/src/main/javascript/prototype.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-16 05:27:48 -0400 (Thu, 16 Aug 2007)
New Revision: 2285
Modified:
trunk/framework/impl/src/main/javascript/prototype/patches.js
Log:
Element.isNodeInDOMTree changed to Element.descendantOf in Element.isUninitialized
Modified: trunk/framework/impl/src/main/javascript/prototype/patches.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/patches.js 2007-08-16 00:55:58 UTC (rev 2284)
+++ trunk/framework/impl/src/main/javascript/prototype/patches.js 2007-08-16 09:27:48 UTC (rev 2285)
@@ -52,6 +52,9 @@
if (!element.parentNode || element.document && element.document.readyState == "uninitialized") {
return true;
+ } else
+ {
+ return !Element.descendantOf(element, document.documentElement);
}
return false;
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2284 - in trunk: framework/api/src/main/java/org/richfaces/model and 13 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-15 20:55:58 -0400 (Wed, 15 Aug 2007)
New Revision: 2284
Added:
trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java
trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java
trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java
trunk/ui/treeModel/src/test/resources/
trunk/ui/treeModel/src/test/resources/org/
trunk/ui/treeModel/src/test/resources/org/richfaces/
trunk/ui/treeModel/src/test/resources/org/richfaces/component/
trunk/ui/treeModel/src/test/resources/org/richfaces/component/tree-model-data.xml
Removed:
trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModel.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModelListener.java
trunk/ui/treeModel/src/main/templates/
trunk/ui/treeModel/src/test/java/org/richfaces/component/JSFComponentTest.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/AjaxSelectedEvent.java
trunk/framework/api/src/main/java/org/richfaces/event/NodeSelectedEvent.java
trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeDataModelTest.java
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
Log:
Fixes and updates:
- tree: node selection obeys validation
- tree: data models work with NodeList & NamedNodeMap
- StackingTreeModel.java: isRowAvailable() handling added, code slightly optimized
- TreeState.java API aligned
- tree.js: fixed selection restoration error when previous selection was null
- TreeModelComponentTest.java added
- VisualStackingTreeModel.java and handling added
Modified: trunk/framework/api/src/main/java/org/richfaces/event/AjaxSelectedEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/AjaxSelectedEvent.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/event/AjaxSelectedEvent.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -38,4 +38,8 @@
super(component);
}
+ public AjaxSelectedEvent(UIComponent component, boolean duplicate) {
+ super(component, duplicate);
+ }
+
}
Modified: trunk/framework/api/src/main/java/org/richfaces/event/NodeSelectedEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/NodeSelectedEvent.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/event/NodeSelectedEvent.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -32,10 +32,18 @@
*/
public class NodeSelectedEvent extends FacesEvent {
+ private boolean duplicate = false;
+
public NodeSelectedEvent(UIComponent component) {
super(component);
}
+ public NodeSelectedEvent(UIComponent component, boolean duplicate) {
+ super(component);
+
+ this.duplicate = duplicate;
+ }
+
/**
*
*/
@@ -57,4 +65,7 @@
((NodeSelectedListener) listener).processSelection(this);
}
+ public boolean isDuplicate() {
+ return duplicate;
+ }
}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -4,14 +4,20 @@
package org.richfaces.model;
import java.io.IOException;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
import javax.faces.context.FacesContext;
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.model.ExtendedDataModel;
import org.ajax4jsf.model.Range;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
/**
* @author Nick Belaevski mailto:nbelaevski@exadel.com created 30.07.2007
@@ -21,7 +27,8 @@
private Map map;
private Object rowKey;
-
+ private Object wrappedData;
+
/*
* (non-Javadoc)
*
@@ -96,7 +103,7 @@
* @see javax.faces.model.DataModel#getWrappedData()
*/
public Object getWrappedData() {
- return map;
+ return wrappedData;
}
/*
@@ -122,7 +129,73 @@
* @see javax.faces.model.DataModel#setWrappedData(java.lang.Object)
*/
public void setWrappedData(Object data) {
- this.map = (Map) data;
+ this.wrappedData = data;
+ if (data instanceof NamedNodeMap) {
+ this.map = new AbstractMap() {
+
+ private Set entrySet = new AbstractSet() {
+
+ public Iterator iterator() {
+ return new Iterator() {
+ private int index = 0;
+
+ public boolean hasNext() {
+ return index < ((NamedNodeMap) getWrappedData()).getLength();
+ }
+
+ public Object next() {
+ final Node node = ((NamedNodeMap) getWrappedData()).item(index++);
+ if (node == null) {
+ throw new NoSuchElementException();
+ } else {
+ return new Map.Entry() {
+
+ public Object getKey() {
+ return node.getNodeName();
+ }
+
+ public Object getValue() {
+ return node;
+ }
+
+ public Object setValue(Object arg0) {
+ throw new UnsupportedOperationException();
+ }
+
+ };
+ }
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ public int size() {
+ return ((NamedNodeMap) getWrappedData()).getLength();
+ }
+
+ };
+
+ public boolean containsKey(Object key) {
+ return ((NamedNodeMap) getWrappedData()).getNamedItem((String) key) != null;
+ }
+
+ public Object get(Object key) {
+ return ((NamedNodeMap) getWrappedData()).getNamedItem((String) key);
+ }
+
+ public Set entrySet() {
+ return entrySet;
+ }
+
+ };
+ } else if (data != null) {
+ this.map = (Map) data;
+ } else {
+ this.map = null;
+ }
}
}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -4,6 +4,7 @@
package org.richfaces.model;
import java.io.IOException;
+import java.util.AbstractList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -13,6 +14,7 @@
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.model.ExtendedDataModel;
import org.ajax4jsf.model.Range;
+import org.w3c.dom.NodeList;
/**
* @author Nick Belaevski
@@ -106,6 +108,18 @@
this.wrappedData = data;
if (data instanceof List) {
this.list = (List) data;
+ } else if (data instanceof NodeList) {
+ this.list = new AbstractList() {
+
+ public Object get(int index) {
+ return ((NodeList) getWrappedData()).item(index);
+ }
+
+ public int size() {
+ return ((NodeList) getWrappedData()).getLength();
+ }
+
+ };
} else if (data != null) {
this.list = Arrays.asList((Object[]) data);
} else {
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -5,14 +5,11 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
-import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import org.ajax4jsf.model.DataVisitor;
@@ -20,12 +17,13 @@
import org.ajax4jsf.model.Range;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.iterators.FilterIterator;
+import org.w3c.dom.NamedNodeMap;
/**
* @author Nick Belaevski mailto:nbelaevski@exadel.com created 25.07.2007
*
*/
-public class StackingTreeModel extends AbstractTreeDataModel implements TreeComponentModel {
+public class StackingTreeModel extends AbstractTreeDataModel {
//ctor arguments
private String id;
@@ -36,9 +34,6 @@
private StackingTreeModel parent;
private Map models = new LinkedHashMap();
- //listeners
- private List treeComponentModelListeners = new ArrayList();
-
private Object rowKey;
private class StackEntry {
@@ -60,7 +55,7 @@
public ExtendedDataModel getDataModel() {
Object data = dataProvider.getData();
ExtendedDataModel dataModel;
- if (data instanceof Map) {
+ if (data instanceof Map || data instanceof NamedNodeMap) {
dataModel = new MapDataModel();
} else {
dataModel = new SequenceDataModel();
@@ -70,6 +65,18 @@
return dataModel;
}
+ protected StackingTreeModel getCurrentModel() {
+ if (this.rowKey == null) {
+ return this;
+ }
+
+ if (isRowAvailable()) {
+ return ((StackEntry) stackEntries.getLast()).model;
+ }
+
+ return null;
+ }
+
public boolean isEmpty() {
//TODO optimize that
return getDataModel().getRowCount() == 0;
@@ -105,32 +112,41 @@
}
}
- protected StackingTreeModel doSetupKey(Iterator keyIterator, Iterator entriesIterator, FacesContext context) {
- if (keyIterator == null || !keyIterator.hasNext()) {
- leaveModel(entriesIterator, null, context);
- return this;
- } else {
+ protected StackingTreeModel doSetupKey(Iterator keyIterator, Iterator entriesIterator, FacesContext context, Object modelKey) {
+ if (modelKey != null) {
+ if (!setupModel(modelKey, context)) {
+ //no key is available
+ leaveModel(getRoot().stackEntries.iterator(), null, context);
+ return null;
+ }
+ }
+
+ if (keyIterator != null && keyIterator.hasNext()) {
Key key = (Key) keyIterator.next();
StackingTreeModel stackingTreeModel = this.getInternalModelById(key.modelId);
+ Iterator nextEntriesIterator = null;
+ Object nextModelKey = key.modelKey;
+
if (entriesIterator != null && entriesIterator.hasNext()) {
StackEntry entry = (StackEntry) entriesIterator.next();
- if (entry.model != stackingTreeModel || entry.modelKey != key.modelKey) {
- //entry.model.restoreVariable(entry.varObject);
+ if (!entry.model.equals(stackingTreeModel) || !entry.modelKey.equals(nextModelKey)) {
leaveModel(entriesIterator, entry, context);
-
- stackingTreeModel.setupModel(key.modelKey, context);
- entriesIterator = null;
+ } else {
+ //continue iterating entries, they still lead us by key path
+ nextEntriesIterator = entriesIterator;
+ nextModelKey = null;
}
- } else {
- stackingTreeModel.setupModel(key.modelKey, context);
- entriesIterator = null;
}
- return stackingTreeModel.doSetupKey(keyIterator, entriesIterator, context);
+ //should not be called when nextEntriesIterator & nextModelKey are both valid
+ return stackingTreeModel.doSetupKey(keyIterator, nextEntriesIterator, context, nextModelKey);
+
+ } else {
+ leaveModel(entriesIterator, null, context);
+ return this;
}
}
-
protected StackingTreeModel setupKey(Object key, FacesContext context) {
if (key == this.rowKey) {
if (stackEntries.isEmpty()) {
@@ -144,7 +160,7 @@
keyIterator = ((ListRowKey) key).iterator();
}
- StackingTreeModel model = doSetupKey(keyIterator, stackEntries.iterator(), context);
+ StackingTreeModel model = doSetupKey(keyIterator, stackEntries.iterator(), context, null);
this.rowKey = key;
return model;
@@ -171,16 +187,22 @@
return null;
}
- public void setupModel(Object key, FacesContext facesContext) {
+ public boolean setupModel(Object key, FacesContext facesContext) {
ExtendedDataModel dataModel = getDataModel();
dataModel.setRowKey(key);
- Object rowData = dataModel.getRowData();
- //System.out.println("StackingTreeModel.setupModel() " + rowData);
- Object varObject = setupVariable(rowData, facesContext);
+ if (dataModel.isRowAvailable()) {
+ Object rowData = dataModel.getRowData();
+ //System.out.println("StackingTreeModel.setupModel() " + rowData);
+ Object varObject = setupVariable(rowData, facesContext);
- this.rowData = rowData;
- getRoot().stackEntries.add(new StackEntry(varObject, key, this));
+ this.rowData = rowData;
+ getRoot().stackEntries.add(new StackEntry(varObject, key, this));
+
+ return true;
+ }
+
+ return false;
}
public void setParent(StackingTreeModel parent) {
@@ -193,7 +215,12 @@
* @see org.richfaces.model.AbstractTreeDataModel#getTreeNode()
*/
public TreeNode getTreeNode() {
- return null;
+ if (this.rowKey == null || isRowAvailable()) {
+ return null;
+ }
+
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
}
/*
@@ -202,20 +229,25 @@
* @see org.richfaces.model.AbstractTreeDataModel#isLeaf()
*/
public boolean isLeaf() {
- if (stackEntries.isEmpty()) {
- return false;
- }
+ if (isRowAvailable()) {
+ if (stackEntries.isEmpty()) {
+ return false;
+ }
- StackEntry lastEntry = (StackEntry) stackEntries.getLast();
- for (Iterator iterator = lastEntry.model.getInternalModelsIterator(); iterator.hasNext();) {
- StackingTreeModel stackingTreeModel = (StackingTreeModel) iterator.next();
+ StackEntry lastEntry = (StackEntry) stackEntries.getLast();
+ for (Iterator iterator = lastEntry.model.getInternalModelsIterator(); iterator.hasNext();) {
+ StackingTreeModel stackingTreeModel = (StackingTreeModel) iterator.next();
- if (!stackingTreeModel.isEmpty()) {
- return false;
+ if (!stackingTreeModel.isEmpty()) {
+ return false;
+ }
}
+
+ return true;
}
-
- return true;
+
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
}
protected StackingTreeModel getRoot() {
@@ -444,12 +476,17 @@
* @see javax.faces.model.DataModel#getRowData()
*/
public Object getRowData() {
- if (stackEntries.isEmpty()) {
- return null;
+ if (isRowAvailable()) {
+ if (stackEntries.isEmpty()) {
+ return null;
+ }
+
+ StackEntry lastEntry = (StackEntry) stackEntries.getLast();
+ return lastEntry.model.rowData;
}
-
- StackEntry lastEntry = (StackEntry) stackEntries.getLast();
- return lastEntry.model.rowData;
+
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
}
/*
@@ -458,8 +495,7 @@
* @see javax.faces.model.DataModel#isRowAvailable()
*/
public boolean isRowAvailable() {
- // TODO Auto-generated method stub
- return true;
+ return !stackEntries.isEmpty();
}
public StackingTreeModel getParent() {
@@ -516,28 +552,6 @@
}
}
- public void addTreeComponentModelListener(
- TreeComponentModelListener listener) {
- this.treeComponentModelListeners.add(listener);
- }
-
- public void removeTreeComponentModelListener(
- TreeComponentModelListener listener) {
- this.treeComponentModelListeners.remove(listener);
- }
-
- protected void componentSelected(UIComponent component) {
- for (Iterator iterator = this.treeComponentModelListeners.iterator(); iterator.hasNext();) {
- TreeComponentModelListener listener = (TreeComponentModelListener) iterator.next();
-
- listener.componentSelected(component);
- }
-
- if (parent != null) {
- parent.componentSelected(component);
- }
- }
-
protected boolean isActiveData() {
return true;
}
Deleted: trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModel.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -1,15 +0,0 @@
-/**
- *
- */
-package org.richfaces.model;
-
-/**
- * @author Nick Belaevski
- * mailto:nbelaevski@exadel.com
- * created 24.07.2007
- *
- */
-public interface TreeComponentModel {
- public void addTreeComponentModelListener(TreeComponentModelListener listener);
- public void removeTreeComponentModelListener(TreeComponentModelListener listener);
-}
Deleted: trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModelListener.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModelListener.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModelListener.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -1,16 +0,0 @@
-/**
- *
- */
-package org.richfaces.model;
-
-import javax.faces.component.UIComponent;
-
-/**
- * @author Nick Belaevski
- * mailto:nbelaevski@exadel.com
- * created 29.07.2007
- *
- */
-public interface TreeComponentModelListener {
- public void componentSelected(UIComponent component);
-}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -56,10 +56,8 @@
}
}
-
- public void walk(FacesContext context, DataVisitor dataVisitor,
+ protected void doWalk(FacesContext context, DataVisitor dataVisitor,
Range range, Object rowKey, Object argument, boolean last) throws IOException {
-
ListRowKey listRowKey = (ListRowKey) rowKey;
TreeNode node = locateTreeNode(listRowKey);
@@ -113,7 +111,7 @@
newRowKey = new ListRowKey(identifier);
}
- this.walk(context, dataVisitor, range, newRowKey, argument, isLast);
+ this.doWalk(context, dataVisitor, range, newRowKey, argument, isLast);
}
identifier = nextIdentifier;
@@ -124,7 +122,21 @@
}
}
}
+
+ public void walk(FacesContext context, DataVisitor dataVisitor,
+ Range range, Object rowKey, Object argument, boolean last) throws IOException {
+ if (rowKey != null) {
+ setRowKey(rowKey);
+ if (!isRowAvailable()) {
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
+ }
+ }
+
+ doWalk(context, dataVisitor, range, rowKey, argument, last);
+ }
+
public TreeNode locateTreeNode(TreeRowKey rowKey) {
return locateTreeNode(rowKey, false);
}
@@ -194,18 +206,26 @@
}
public Object getRowData() {
- TreeNode treeNode = locateTreeNode(this.currentRowKey);
- if (treeNode != null) {
- return treeNode.getData();
+ if (isRowAvailable()) {
+ TreeNode treeNode = locateTreeNode(this.currentRowKey);
+ if (treeNode != null) {
+ return treeNode.getData();
+ }
+
+ return null;
}
+
- return null;
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
}
public boolean isLeaf() {
- TreeNode treeNode = locateTreeNode(this.currentRowKey);
- if (treeNode != null) {
- return treeNode.isLeaf();
+ if (isRowAvailable()) {
+ TreeNode treeNode = locateTreeNode(this.currentRowKey);
+ if (treeNode != null) {
+ return treeNode.isLeaf();
+ }
}
throw new IllegalStateException(
@@ -217,6 +237,11 @@
}
public TreeNode getTreeNode() {
- return locateTreeNode(this.currentRowKey);
+ if (isRowAvailable()) {
+ return locateTreeNode(this.currentRowKey);
+ }
+
+ throw new IllegalStateException(
+ "No tree element available or row key not set!");
}
}
Copied: trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java (from rev 2250, trunk/framework/api/src/main/java/org/richfaces/model/TreeComponentModelListener.java)
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package org.richfaces.model;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Nick Belaevski
+ * mailto:nbelaevski@exadel.com
+ * created 29.07.2007
+ *
+ */
+public interface TreeModelVisualComponentProvider {
+ public UIComponent getComponent();
+}
Added: trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -0,0 +1,42 @@
+/**
+ *
+ */
+package org.richfaces.model;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Nick Belaevski
+ * mailto:nbelaevski@exadel.com
+ * created 15.08.2007
+ *
+ */
+public class VisualStackingTreeModel extends StackingTreeModel implements TreeModelVisualComponentProvider {
+ private UIComponent component;
+
+ public VisualStackingTreeModel(UIComponent component) {
+ super();
+
+ this.component = component;
+ }
+
+ public VisualStackingTreeModel(String id, String var,
+ StackingTreeModelDataProvider dataProvider, UIComponent component) {
+ super(id, var, dataProvider);
+
+ this.component = component;
+ }
+
+ public UIComponent getComponent() {
+ if (this.component != null) {
+ return this.component;
+ }
+
+ StackingTreeModel currentModel = getCurrentModel();
+ if (currentModel != null && currentModel != this) {
+ return ((TreeModelVisualComponentProvider) currentModel).getComponent();
+ }
+
+ return null;
+ }
+}
Modified: trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeDataModelTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeDataModelTest.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeDataModelTest.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -7,8 +7,6 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
@@ -130,30 +128,31 @@
this.stackingTreeModel.walk(facesContext, visitor1, null, null);
assertEquals(9, visitor1.getCounter());
this.stackingTreeModel.setRowKey(null);
- assertNull(this.stackingTreeModel.getRowData());
- assertFalse(this.stackingTreeModel.isLeaf());
-
+ assertFalse(this.stackingTreeModel.isRowAvailable());
+
Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
assertSame(this.projectRequestObject, requestParameterMap.get("project"));
assertSame(this.directoryRequestObject, requestParameterMap.get("directory"));
assertSame(this.fileRequestObject, requestParameterMap.get("file"));
}
- public void testComponentsListener() throws Exception {
- UIOutput output = new UIOutput();
- TreeComponentModelListenerImpl listener = new TreeComponentModelListenerImpl();
- stackingTreeModel.addTreeComponentModelListener(listener);
- assertNull(listener.getComponent());
- filesModel.componentSelected(output);
- assertSame(output, listener.getComponent());
+ public void testBadKey() throws Exception {
+ StackingTreeDataModelTestVisitor1 visitor1 = new StackingTreeDataModelTestVisitor1();
+ this.stackingTreeModel.walk(facesContext, visitor1, null, null);
+ this.stackingTreeModel.setRowKey(new ListRowKey(new StackingTreeModel.Key("project", "projectA")));
+ assertTrue(this.stackingTreeModel.isRowAvailable());
+ assertNotNull(this.stackingTreeModel.getRowData());
+
+ this.stackingTreeModel.setRowKey(new ListRowKey(new StackingTreeModel.Key("project", "projectAAAAA")));
+ assertFalse(this.stackingTreeModel.isRowAvailable());
+ try {
+ this.stackingTreeModel.getRowData();
+ fail();
+ } catch (Exception e) {
- listener.reset();
- assertNull(listener.getComponent());
- stackingTreeModel.removeTreeComponentModelListener(listener);
- filesModel.componentSelected(output);
- assertNull(listener.getComponent());
+ }
}
-
+
public void testActiveData() throws Exception {
final ValueBinding fileVB = application.createValueBinding("#{directory.files}");
StackingTreeModel localFilesModel = new StackingTreeModel("file", "file", new StackingTreeModelDataProvider() {
@@ -251,23 +250,6 @@
assertFalse(new Key("aaa", null).hashCode() == new Key("aaa", new Integer(10)).hashCode());
}
- class TreeComponentModelListenerImpl implements TreeComponentModelListener {
-
- private UIComponent component;
-
- public void componentSelected(UIComponent component) {
- this.component = component;
- }
-
- public UIComponent getComponent() {
- return component;
- }
-
- public void reset() {
- this.component = null;
- }
- };
-
class StackingTreeDataModelTestVisitor1 implements DataVisitor, LastElementAware {
private boolean last;
@@ -361,7 +343,11 @@
assertTrue(currentTag > tag);
this.tag = currentTag;
- assertFalse(this.tag % 10 == 1 ^ last);
+ if (this.tag % 10 == 1) {
+ assertTrue(last);
+ } else {
+ assertFalse(last);
+ }
if (named instanceof Directory) {
if ("ADir1".equals(named.getName())) {
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.Map;
import javax.faces.application.Application;
@@ -64,11 +63,12 @@
import org.richfaces.model.AbstractTreeDataModel;
import org.richfaces.model.StackingTreeModel;
import org.richfaces.model.StackingTreeModelProvider;
-import org.richfaces.model.TreeComponentModelListener;
import org.richfaces.model.TreeDataModel;
+import org.richfaces.model.TreeModelVisualComponentProvider;
import org.richfaces.model.TreeNode;
import org.richfaces.model.TreeRange;
import org.richfaces.model.TreeRowKey;
+import org.richfaces.model.VisualStackingTreeModel;
/**
* @author igels Component class providing tree ADT behaviuor
@@ -235,18 +235,20 @@
}
}
} else {
- Iterator iterator = null;
- if (visualModelComponent != null && visualModelComponent.isRendered()) {
- if (visualModelComponent.getChildCount() > 0) {
- iterator = visualModelComponent.getChildren().iterator();
- }
- } else {
- if (getChildCount() > 0) {
- iterator = getChildren().iterator();
- }
+ UIComponent component = null;
+
+ ExtendedDataModel dataModel = getExtendedDataModel();
+ if (dataModel instanceof TreeModelVisualComponentProvider) {
+ TreeModelVisualComponentProvider componentProvider = (TreeModelVisualComponentProvider) dataModel;
+ component = componentProvider.getComponent();
}
+
+ if (component == null) {
+ component = this;
+ }
- if (iterator != null) {
+ if (component.isRendered() && component.getChildCount() > 0) {
+ Iterator iterator = component.getChildren().iterator();
while (iterator.hasNext()) {
UIComponent child = (UIComponent) iterator.next();
@@ -392,7 +394,7 @@
if (null != getAttributes().get(SELECTION_INPUT_ATTRIBUTE)) {
TreeState state = (TreeState) getComponentState();
- if (state.setSelected(null)) {
+ if (!state.isSelected(null)) {
new NodeSelectedEvent(this).queue();
}
}
@@ -447,6 +449,13 @@
return treeState.isSelected((TreeRowKey) this.getRowKey());
}
+ /**
+ * Sets current node as selected
+ */
+ public void setSelected() {
+ TreeState treeState = (TreeState) getComponentState();
+ treeState.setSelected((TreeRowKey) this.getRowKey());
+ }
protected Iterator fixedChildren() {
return getFacets().values().iterator();
@@ -481,6 +490,13 @@
}
}
+ if (event instanceof NodeSelectedEvent) {
+ NodeSelectedEvent selectedEvent = (NodeSelectedEvent) event;
+ if (!selectedEvent.isDuplicate()) {
+ setSelected();
+ }
+ }
+
// fire node events
TreeEvents.invokeListenerBindings(this, event, getFacesContext());
@@ -493,8 +509,6 @@
return isAjaxSubmitSelection();
}
- private transient UIComponent visualModelComponent;
-
private ExtendedDataModel createDataModel(boolean allowCached) {
Object value = this.getValue();
if (value != null) {
@@ -508,7 +522,7 @@
return treeDataModel;
} else {
//TODO implement request caching
- StackingTreeModel stackingTreeModel = new StackingTreeModel();
+ StackingTreeModel stackingTreeModel = new VisualStackingTreeModel(null);
if (getChildCount() > 0) {
Iterator children = getChildren().iterator();
while (children.hasNext()) {
@@ -520,13 +534,6 @@
}
}
- stackingTreeModel.addTreeComponentModelListener(new TreeComponentModelListener() {
-
- public void componentSelected(UIComponent component) {
- visualModelComponent = component;
- }
- });
-
return stackingTreeModel;
}
}
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -20,6 +20,7 @@
import org.richfaces.event.DropEvent;
import org.richfaces.event.DropListener;
import org.richfaces.event.NodeExpandedListener;
+import org.richfaces.event.NodeSelectedEvent;
import org.richfaces.event.NodeSelectedListener;
import org.richfaces.event.TreeListenerEventsProducer;
@@ -104,10 +105,18 @@
super.broadcast(event);
FacesContext context = getFacesContext();
+ UITree tree = getUITree();
+
+ if (event instanceof NodeSelectedEvent) {
+ NodeSelectedEvent selectedEvent = (NodeSelectedEvent) event;
+ if (!selectedEvent.isDuplicate()) {
+ tree.setSelected();
+ }
+ }
+
TreeEvents.invokeListenerBindings(this, event, context);
//TODO quick fix for UITree to invoke listeners
- UITree tree = getUITree();
if (tree != null) {
if (event instanceof DragEvent || event instanceof DropEvent) {
tree.broadcast(event);
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -32,10 +32,10 @@
import org.ajax4jsf.model.DataComponentState;
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.model.Range;
-import org.richfaces.model.TreeRange;
-import org.richfaces.model.TreeRowKey;
import org.richfaces.component.UITree;
import org.richfaces.component.state.events.TreeStateCommandsListener;
+import org.richfaces.model.TreeRange;
+import org.richfaces.model.TreeRowKey;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com created 23.11.2006
@@ -114,37 +114,15 @@
}
public boolean isSelected(TreeRowKey rowKey) {
- return (selectedNode != null && selectedNode.equals(rowKey));
+ return (rowKey == null && selectedNode == null) || (selectedNode != null && selectedNode.equals(rowKey));
}
public TreeRowKey getSelectedNode() {
return selectedNode;
}
- public boolean setSelected(TreeRowKey rowKey) {
- if (selectedNode == null) {
- if (rowKey != null) {
- selectedNode = rowKey;
-
- return true;
- }
-
- return false;
- } else {
- if (rowKey != null) {
- if (!selectedNode.equals(rowKey)) {
- selectedNode = rowKey;
-
- return true;
- }
-
- return false;
- } else {
- selectedNode = null;
-
- return true;
- }
- }
+ public void setSelected(TreeRowKey rowKey) {
+ selectedNode = rowKey;
}
private boolean _transient;
@@ -291,4 +269,5 @@
expandedNodes.removeAll(queuedCollapsedNodes);
queuedCollapsedNodes.clear();
}
+
}
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -282,16 +282,16 @@
if (id.equals(tree.getAttributes()
.get(UITree.SELECTION_INPUT_ATTRIBUTE))) {
- if (componentState.setSelected(key)) {
+ if (!componentState.isSelected(key)) {
if (tree.getAttributes().get(
UITree.SELECTED_NODE_PARAMETER_NAME) == null) {
new NodeSelectedEvent(node).queue();
- new NodeSelectedEvent(tree).queue();
+ new NodeSelectedEvent(tree, true).queue();
} else {
new AjaxSelectedEvent(node).queue();
- new AjaxSelectedEvent(tree).queue();
+ new AjaxSelectedEvent(tree, true).queue();
}
}
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-16 00:55:58 UTC (rev 2284)
@@ -65,7 +65,9 @@
if (!selectResult) {
event["cancelSelection"] = true;
event["treeItem"] = prevSelection;
- prevSelection.toggleSelection(event);
+ if (prevSelection) {
+ prevSelection.toggleSelection(event);
+ }
return ;
}
@@ -73,7 +75,9 @@
if (!selectResult) {
event["cancelSelection"] = true;
event["treeItem"] = prevSelection;
- prevSelection.toggleSelection(event);
+ if (prevSelection) {
+ prevSelection.toggleSelection(event);
+ }
return ;
}
Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -6,13 +6,12 @@
import java.util.Iterator;
-import javax.faces.context.FacesContext;
-import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.ValueBinding;
import org.apache.commons.collections.iterators.IteratorChain;
import org.richfaces.model.StackingTreeModel;
import org.richfaces.model.StackingTreeModelDataProvider;
+import org.richfaces.model.VisualStackingTreeModel;
/**
@@ -21,9 +20,9 @@
*/
public abstract class UIRecursiveTreeNodes extends UITreeNodes {
- private static final String COMPONENT_TYPE = "org.richfaces.RecursiveTreeNodes";
+ public static final String COMPONENT_TYPE = "org.richfaces.RecursiveTreeNodes";
- private static final String COMPONENT_FAMILY = "org.richfaces.RecursiveTreeNodes";
+ public static final String COMPONENT_FAMILY = "org.richfaces.RecursiveTreeNodes";
public abstract Object getRoot();
public abstract void setRoot(Object root);
@@ -63,19 +62,14 @@
public StackingTreeModel getStackingModel() {
StackingTreeModel stackingModel = super.getStackingModel();
- StackingTreeModel recursiveModel = new StackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
+ StackingTreeModel recursiveModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
public Object getData() {
return UIRecursiveTreeNodes.this.getNodes();
}
- }) {
+ }, UIRecursiveTreeNodes.this) {
- public void setupModel(Object object, FacesContext facesContext) {
- super.setupModel(object, facesContext);
- componentSelected(UIRecursiveTreeNodes.this);
- }
-
public StackingTreeModel getModelById(String id) {
StackingTreeModel model = super.getModelById(id);
if (model == null) {
Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -4,11 +4,10 @@
package org.richfaces.component;
-import javax.faces.context.FacesContext;
-
import org.richfaces.model.StackingTreeModel;
import org.richfaces.model.StackingTreeModelDataProvider;
import org.richfaces.model.StackingTreeModelProvider;
+import org.richfaces.model.VisualStackingTreeModel;
/**
@@ -17,9 +16,9 @@
*/
public abstract class UITreeNodes extends StackingTreeModelProvider {
- private static final String COMPONENT_TYPE = "org.richfaces.TreeNodes";
+ public static final String COMPONENT_TYPE = "org.richfaces.TreeNodes";
- private static final String COMPONENT_FAMILY = "org.richfaces.TreeNodes";
+ public static final String COMPONENT_FAMILY = "org.richfaces.TreeNodes";
public abstract String getVar();
public abstract void setVar(String var);
@@ -28,18 +27,13 @@
public abstract void setActive(boolean active);
protected StackingTreeModel createStackingTreeModel() {
- StackingTreeModel treeModel = new StackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
+ StackingTreeModel treeModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
public Object getData() {
return UITreeNodes.this.getData();
}
- }) {
- public void setupModel(Object object, FacesContext facesContext) {
- super.setupModel(object, facesContext);
- componentSelected(UITreeNodes.this);
- }
-
+ }, UITreeNodes.this) {
protected boolean isActive() {
return UITreeNodes.this.isRendered();
}
Deleted: trunk/ui/treeModel/src/test/java/org/richfaces/component/JSFComponentTest.java
===================================================================
--- trunk/ui/treeModel/src/test/java/org/richfaces/component/JSFComponentTest.java 2007-08-16 00:05:26 UTC (rev 2283)
+++ trunk/ui/treeModel/src/test/java/org/richfaces/component/JSFComponentTest.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -1,53 +0,0 @@
-/**
- * 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.component;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
-
-/**
- * Unit test for simple Component.
- */
-public class JSFComponentTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public JSFComponentTest( String testName )
- {
- super( testName );
- }
-
-
- /**
- * Rigourous Test :-)
- */
- public void testComponent()
- {
- assertTrue( true );
- }
-}
Copied: trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java (from rev 2262, trunk/ui/treeModel/src/test/java/org/richfaces/component/JSFComponentTest.java)
===================================================================
--- trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java (rev 0)
+++ trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2007-08-16 00:55:58 UTC (rev 2284)
@@ -0,0 +1,261 @@
+/**
+ * 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.component;
+
+import java.io.InputStream;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlTable;
+import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
+
+/**
+ * Unit test for simple Component.
+ */
+public class TreeModelComponentTest
+ extends AbstractAjax4JsfTestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public TreeModelComponentTest( String testName )
+ {
+ super( testName );
+ }
+
+ private UIComponent createOutput(String vb) {
+ UIComponent component = application.createComponent(UITreeNode.COMPONENT_TYPE);
+ UIOutput output = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
+ output.setValueBinding("value", application.createValueBinding(vb));
+
+ component.getChildren().add(output);
+ return component;
+ }
+
+ private Document document;
+
+ private void clearDocument(Node node) {
+ Node child = node.getFirstChild();
+ while (child != null) {
+ Node sibling = child.getNextSibling();
+ if (child.getNodeType() == Node.TEXT_NODE && child.getNodeValue().trim().length() == 0) {
+ child.getParentNode().removeChild(child);
+ } else {
+ clearDocument(child);
+ }
+
+ child = sibling;
+ }
+ }
+
+ private Node findNode(String id, Node node) {
+ Node n = node.getFirstChild();
+ while (n != null) {
+ NamedNodeMap attributes = n.getAttributes();
+ if (attributes != null) {
+ if (id.equals(attributes.getNamedItem("id").getNodeValue())) {
+ return n;
+ }
+ }
+
+ Node result = findNode(id, n);
+ if (result != null) {
+ return result;
+ }
+
+ n = n.getNextSibling();
+ }
+
+ return null;
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ facesContext.getExternalContext().getApplicationMap().put("XPathMap", new TreeModelComponentTestMap());
+ facesContext.getExternalContext().getApplicationMap().put("XPathStringMap", new TreeModelComponentTestMap());
+ InputStream stream = TreeModelComponentTest.class.getResourceAsStream("tree-model-data.xml");
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ document = factory.newDocumentBuilder().parse(stream);
+ clearDocument(document);
+ facesContext.getExternalContext().getApplicationMap().put("nodes", document.getDocumentElement());
+
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ UIComponent form = application.createComponent(UIForm.COMPONENT_TYPE);
+ viewRoot.getChildren().add(form);
+ UITree tree = (UITree) application.createComponent(UITree.COMPONENT_TYPE);
+ tree.setSwitchType("client");
+ tree.setId("tree");
+ form.getChildren().add(tree);
+
+ UITreeNodes project = (UITreeNodes) application.createComponent(UITreeNodes.COMPONENT_TYPE);
+ project.setVar("project");
+ project.setValueBinding("nodes", application.createValueBinding("#{nodes}"));
+ project.getChildren().add(createOutput("#{XPathStringMap['$project/@id']}"));
+ project.setId("project");
+
+ tree.getChildren().add(project);
+
+ UIRecursiveTreeNodes directories = (UIRecursiveTreeNodes) application.createComponent(UIRecursiveTreeNodes.COMPONENT_TYPE);
+ directories.setVar("dir");
+ directories.setValueBinding("root", application.createValueBinding("#{XPathMap['$project/directory']}"));
+ directories.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$dir/directory']}"));
+ directories.getChildren().add(createOutput("#{XPathStringMap['$dir/@id']}"));
+ directories.setId("dir");
+
+ project.getChildren().add(directories);
+
+ UITreeNodes files = (UITreeNodes) application.createComponent(UITreeNodes.COMPONENT_TYPE);
+ files.setVar("file");
+ files.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$dir/file']}"));
+ files.getChildren().add(createOutput("#{XPathStringMap['$file/@id']}"));
+ files.setId("files");
+
+ directories.getChildren().add(files);
+
+ UIRecursiveTreeNodes archives = (UIRecursiveTreeNodes) application.createComponent(UIRecursiveTreeNodes.COMPONENT_TYPE);
+ archives.setVar("archiveEntry");
+ archives.setValueBinding("root", application.createValueBinding("#{XPathMap['$dir/archive']}"));
+ archives.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$archiveEntry/archiveEntry']}"));
+ archives.getChildren().add(createOutput("#{XPathStringMap['$archiveEntry/@id']}"));
+ archives.setId("archives");
+
+ directories.getChildren().add(archives);
+ }
+
+ public void tearDown() throws Exception {
+ facesContext.getExternalContext().getApplicationMap().remove("XPathMap");
+ facesContext.getExternalContext().getApplicationMap().remove("XPathStringMap");
+ facesContext.getExternalContext().getApplicationMap().remove("nodes");
+
+ super.tearDown();
+
+ this.document = null;
+ }
+
+ public void testRender() throws Exception {
+ HtmlPage renderedView = renderView();
+ List htmlElementsByTagName = renderedView.getDocumentElement().getHtmlElementsByTagName("table");
+
+ Iterator allHtmlChildElements = htmlElementsByTagName.iterator();
+ int counter = 0;
+
+ while (allHtmlChildElements.hasNext()) {
+ HtmlTable table = (HtmlTable) allHtmlChildElements.next();
+ HtmlTableCell handleCell = (HtmlTableCell) table.getCellAt(0, 0);
+ HtmlTableCell iconCell = (HtmlTableCell) table.getCellAt(0, 1);
+ HtmlTableCell textCell = (HtmlTableCell) table.getCellAt(0, 2);
+
+ Element element = (Element) findNode(textCell.asText(), document);
+ //skip text siblings
+ Node nextSibling = element.getNextSibling();
+
+ System.out.println(table);
+ System.out.println(handleCell);
+ System.out.println(textCell.asText() + " " + textCell);
+ System.out.println(element);
+
+ if (nextSibling == null) {
+ assertTrue(handleCell.getAttributeValue("class").contains("dr-tree-h-ic-line-last"));
+ } else {
+ assertTrue(handleCell.getAttributeValue("class").contains("dr-tree-h-ic-line-node"));
+ }
+
+ HtmlElement handleElement = (HtmlElement) handleCell.getFirstChild().getFirstChild().getNextSibling();
+ String handleId = handleElement.getAttributeValue("id");
+
+ if (element.getChildNodes().getLength() == 0) {
+ assertTrue(handleId.endsWith(":handle:img"));
+ } else {
+ assertTrue(handleId.endsWith(":handle"));
+ }
+
+ counter++;
+ }
+
+ assertEquals(30, counter);
+ }
+}
+
+class TreeModelComponentTestMap extends AbstractMap {
+
+ public Object get(Object key) {
+ String s = (String) key;
+ int idx = s.indexOf('/');
+ String varName = s.substring(1, idx);
+ String path = s.substring(idx + 1);
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ Object var = facesContext.getApplication().getVariableResolver().resolveVariable(facesContext, varName);
+
+ if (path.startsWith("@")) {
+ return ((Node) var).getAttributes().getNamedItem(path.substring(1)).getNodeValue();
+ } else {
+ NodeList nodeList = (NodeList) var;
+ final ArrayList nodes = new ArrayList();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if (path.equals(node.getNodeName())) {
+ nodes.add(node);
+ }
+ }
+
+ return new NodeList() {
+
+ public int getLength() {
+ return nodes.size();
+ }
+
+ public Node item(int index) {
+ return (Node) nodes.get(index);
+ }
+
+ };
+ }
+ }
+
+ public Set entrySet() {
+ return null;
+ }
+
+}
\ No newline at end of file
Added: trunk/ui/treeModel/src/test/resources/org/richfaces/component/tree-model-data.xml
===================================================================
--- trunk/ui/treeModel/src/test/resources/org/richfaces/component/tree-model-data.xml (rev 0)
+++ trunk/ui/treeModel/src/test/resources/org/richfaces/component/tree-model-data.xml 2007-08-16 00:55:58 UTC (rev 2284)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<root id="0">
+ <project name="richfaces" id="1">
+ <directory name="design" id="2">
+ <directory name="funcspec" id="3">
+ <file name="FunctionalSpecification-1.0.doc" id="4"/>
+ <file name="Requirements-1.0.doc" id="5"/>
+ </directory>
+ </directory>
+ <directory name="src" id="6">
+ <directory name="main" id="7">
+ <directory name="config" id="8">
+ <directory name="org" id="9">
+ <directory name="richfaces" id="10">
+ <directory name="component" id="11">
+ <file name="tree.config.xml" id="12"/>
+ <file name="treeNode.config.xml" id="13"/>
+ </directory>
+ </directory>
+ </directory>
+ </directory>
+ <directory name="templates" id="14"></directory>
+ </directory>
+ <directory name="test" id="15"></directory>
+ </directory>
+ <directory name="target" id="16">
+ <file name="richfaces-3.1.0-snapshot" id="21"/>
+ <file name="richfaces-3.1.0-javadoc" id="30"/>
+ <archive name="richfaces-3.1.0-sources" id="22">
+ <archiveEntry name="org" id="23">
+ <archiveEntry name="richfaces" id="24">
+ <archiveEntry name="component" id="25">
+ <archiveEntry name="UITree" id="26"/>
+ <archiveEntry name="UITreeNode" id="27"/>
+ <archiveEntry name="UICalendar" id="28"/>
+ <archiveEntry name="UIRangedNumberInput" id="29"/>
+ </archiveEntry>
+ </archiveEntry>
+ </archiveEntry>
+ </archive>
+ <directory name="generated-component" id="17" />
+ <directory name="surefire-reports" id="18">
+ <file name="org.richfaces.JSFComponentTest.txt" id="19"/>
+ <file name="TEST-ComponentTest.xml" id="20"/>
+ </directory>
+ </directory>
+ </project>
+</root>
\ No newline at end of file
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2283 - trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-15 20:05:26 -0400 (Wed, 15 Aug 2007)
New Revision: 2283
Added:
trunk/markRelease.sh
Log:
script for a create marked release tag
Added: trunk/markRelease.sh
===================================================================
--- trunk/markRelease.sh (rev 0)
+++ trunk/markRelease.sh 2007-08-16 00:05:26 UTC (rev 2283)
@@ -0,0 +1,7 @@
+#!/bin/sh
+mvn release:branch -DdryRun=true -DautoVersionSubmodules=true \
+ -DbranchName=$1 -DupdateBranchVersions=true \
+ -DupdateVersionsToSnapshot=false \
+ -DupdateWorkingCopyVersions=false \
+ -DtagBase=https://svn.jboss.org/repos/richfaces/tags
+find . -name pom.xml.branch -execdir mv pom.xml.branch pom.xml ';'
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2282 - in tags: 3.1.0-rc2 and 78 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-15 19:29:33 -0400 (Wed, 15 Aug 2007)
New Revision: 2282
Added:
tags/3.1.0-rc2/
Modified:
tags/3.1.0-rc2/cdk/generator/pom.xml
tags/3.1.0-rc2/cdk/maven-archetype-jsf-component/pom.xml
tags/3.1.0-rc2/cdk/maven-archetype-jsfwebapp/pom.xml
tags/3.1.0-rc2/cdk/maven-cdk-plugin/pom.xml
tags/3.1.0-rc2/cdk/pom.xml
tags/3.1.0-rc2/docs/ajaxguide/en/pom.xml
tags/3.1.0-rc2/docs/ajaxguide/pom.xml
tags/3.1.0-rc2/docs/pom.xml
tags/3.1.0-rc2/docs/userguide/en/pom.xml
tags/3.1.0-rc2/docs/userguide/pom.xml
tags/3.1.0-rc2/docs/xslt/en/pom.xml
tags/3.1.0-rc2/docs/xslt/pom.xml
tags/3.1.0-rc2/extensions/pom.xml
tags/3.1.0-rc2/extensions/portlet/pom.xml
tags/3.1.0-rc2/framework/api/pom.xml
tags/3.1.0-rc2/framework/impl/pom.xml
tags/3.1.0-rc2/framework/pom.xml
tags/3.1.0-rc2/framework/test/pom.xml
tags/3.1.0-rc2/pom.xml
tags/3.1.0-rc2/samples/calendar-sample/pom.xml
tags/3.1.0-rc2/samples/dataFilterSliderDemo/pom.xml
tags/3.1.0-rc2/samples/dataTableDemo/pom.xml
tags/3.1.0-rc2/samples/datascroller-sample/pom.xml
tags/3.1.0-rc2/samples/dragDropDemo/pom.xml
tags/3.1.0-rc2/samples/dropdownmenu-sample/pom.xml
tags/3.1.0-rc2/samples/gmap-sample/pom.xml
tags/3.1.0-rc2/samples/inputNumberSliderDemo/pom.xml
tags/3.1.0-rc2/samples/inputNumberSpinnerDemo/pom.xml
tags/3.1.0-rc2/samples/local-value-demo/pom.xml
tags/3.1.0-rc2/samples/modalpanel-sample/pom.xml
tags/3.1.0-rc2/samples/panel-sample/pom.xml
tags/3.1.0-rc2/samples/panelbar-sample/pom.xml
tags/3.1.0-rc2/samples/panelmenu-sample/pom.xml
tags/3.1.0-rc2/samples/pom.xml
tags/3.1.0-rc2/samples/rich-message-demo/pom.xml
tags/3.1.0-rc2/samples/richfaces-demo/pom.xml
tags/3.1.0-rc2/samples/separator-sample/pom.xml
tags/3.1.0-rc2/samples/simpleTogglePanel-sample/pom.xml
tags/3.1.0-rc2/samples/skins/pom.xml
tags/3.1.0-rc2/samples/suggestionbox-sample/pom.xml
tags/3.1.0-rc2/samples/tabPanelDemo/pom.xml
tags/3.1.0-rc2/samples/togglePanel-sample/pom.xml
tags/3.1.0-rc2/samples/toolBarDemo/pom.xml
tags/3.1.0-rc2/samples/tooltip-sample/pom.xml
tags/3.1.0-rc2/samples/tree-demo/pom.xml
tags/3.1.0-rc2/samples/treeModelDemo/pom.xml
tags/3.1.0-rc2/ui/assembly/pom.xml
tags/3.1.0-rc2/ui/calendar/pom.xml
tags/3.1.0-rc2/ui/core/pom.xml
tags/3.1.0-rc2/ui/dataFilterSlider/pom.xml
tags/3.1.0-rc2/ui/dataTable/pom.xml
tags/3.1.0-rc2/ui/datascroller/pom.xml
tags/3.1.0-rc2/ui/drag-drop/pom.xml
tags/3.1.0-rc2/ui/dropdown-menu/pom.xml
tags/3.1.0-rc2/ui/effect/pom.xml
tags/3.1.0-rc2/ui/gmap/pom.xml
tags/3.1.0-rc2/ui/inputnumber-slider/pom.xml
tags/3.1.0-rc2/ui/inputnumber-spinner/pom.xml
tags/3.1.0-rc2/ui/insert/pom.xml
tags/3.1.0-rc2/ui/menu-components/pom.xml
tags/3.1.0-rc2/ui/message/pom.xml
tags/3.1.0-rc2/ui/modal-panel/pom.xml
tags/3.1.0-rc2/ui/paint2D/pom.xml
tags/3.1.0-rc2/ui/panel/pom.xml
tags/3.1.0-rc2/ui/panelbar/pom.xml
tags/3.1.0-rc2/ui/panelmenu/pom.xml
tags/3.1.0-rc2/ui/pom.xml
tags/3.1.0-rc2/ui/scrollableDataTable/pom.xml
tags/3.1.0-rc2/ui/separator/pom.xml
tags/3.1.0-rc2/ui/simpleTogglePanel/pom.xml
tags/3.1.0-rc2/ui/spacer/pom.xml
tags/3.1.0-rc2/ui/suggestionbox/pom.xml
tags/3.1.0-rc2/ui/tabPanel/pom.xml
tags/3.1.0-rc2/ui/togglePanel/pom.xml
tags/3.1.0-rc2/ui/toolBar/pom.xml
tags/3.1.0-rc2/ui/tooltip/pom.xml
tags/3.1.0-rc2/ui/tree/pom.xml
tags/3.1.0-rc2/ui/treeModel/pom.xml
tags/3.1.0-rc2/ui/virtualEarth/pom.xml
Log:
Tag 3.1.0-rc2
Copied: tags/3.1.0-rc2 (from rev 2281, trunk)
Modified: tags/3.1.0-rc2/cdk/generator/pom.xml
===================================================================
--- trunk/cdk/generator/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/cdk/generator/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>cdk</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>generator</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Java Server Faces component generator</name>
<build>
<plugins>
Modified: tags/3.1.0-rc2/cdk/maven-archetype-jsf-component/pom.xml
===================================================================
--- trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/cdk/maven-archetype-jsf-component/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,11 +2,11 @@
<parent>
<artifactId>cdk</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetype-jsf-component</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Archetype - maven-archetype-jsf-component</name>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/cdk/maven-archetype-jsfwebapp/pom.xml
===================================================================
--- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/cdk/maven-archetype-jsfwebapp/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,11 +2,11 @@
<parent>
<artifactId>cdk</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetype-jsfwebapp</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Archetype for jsf webapp project</name>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/cdk/maven-cdk-plugin/pom.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/cdk/maven-cdk-plugin/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>cdk</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>maven-plugin</packaging>
<name>Maven plugin for JSF components code generation</name>
<dependencies>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>generator</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/cdk/pom.xml
===================================================================
--- trunk/cdk/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/cdk/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>cdk</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>pom</packaging>
<name>JSF Components Development kit</name>
<dependencies />
Modified: tags/3.1.0-rc2/docs/ajaxguide/en/pom.xml
===================================================================
--- trunk/docs/ajaxguide/en/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/ajaxguide/en/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -5,13 +5,13 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>ajaxguide</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.docs.ajaxguide</groupId>
<artifactId>${translation}</artifactId>
<packaging>jdocbook</packaging>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Ajax4jsf Manual (${translation})</name>
<properties>
Modified: tags/3.1.0-rc2/docs/ajaxguide/pom.xml
===================================================================
--- trunk/docs/ajaxguide/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/ajaxguide/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>docs</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs</groupId>
<artifactId>ajaxguide</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>pom</packaging>
<name>Ajax4jsf user guide</name>
<description>Ajax4jsf user guide</description>
Modified: tags/3.1.0-rc2/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>docs</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Project documentation</name>
<packaging>pom</packaging>
<!-- setup repositories, to build documentation separate from Java projects -->
Modified: tags/3.1.0-rc2/docs/userguide/en/pom.xml
===================================================================
--- trunk/docs/userguide/en/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/userguide/en/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,18 +1,16 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>userguide</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.docs.userguide</groupId>
<artifactId>${translation}</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>jdocbook</packaging>
<name>Richfaces Manual (${translation})</name>
@@ -48,4 +46,4 @@
-->
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/userguide/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,16 +1,14 @@
-<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">
+<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">
<parent>
<artifactId>docs</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs</groupId>
<artifactId>userguide</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>User guide</name>
<description>RichFaces user guide</description>
<pluginRepositories>
@@ -393,8 +391,7 @@
${project.build.directory}/xslt/xslt/f.xsl
</stylesheet>
<fileMappers>
- <fileMapper
- implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>
xml
</targetExtension>
@@ -438,8 +435,7 @@
${project.build.directory}/xslt/xslt/f.xsl
</stylesheet>
<fileMappers>
- <fileMapper
- implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>
xml
</targetExtension>
Modified: tags/3.1.0-rc2/docs/xslt/en/pom.xml
===================================================================
--- trunk/docs/xslt/en/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/xslt/en/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,15 +1,13 @@
-<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">
+<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">
<parent>
<artifactId>xslt</artifactId>
<groupId>org.richfaces.docs</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs.xslt</groupId>
<artifactId>en</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>jar</packaging>
<name>Documentation stylesheets (English translation)</name>
<description>
Modified: tags/3.1.0-rc2/docs/xslt/pom.xml
===================================================================
--- trunk/docs/xslt/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/docs/xslt/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>docs</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs</groupId>
<artifactId>xslt</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>pom</packaging>
<name>Documentation stylesheets</name>
<description>Docbook documentation stylesheets</description>
Modified: tags/3.1.0-rc2/extensions/pom.xml
===================================================================
--- trunk/extensions/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/extensions/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>extensions</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Richfaces extensions for a different environments</name>
<packaging>pom</packaging>
<modules>
Modified: tags/3.1.0-rc2/extensions/portlet/pom.xml
===================================================================
--- trunk/extensions/portlet/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/extensions/portlet/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>extensions</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.extensions</groupId>
<artifactId>portlet</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>ajax4jsf portlet brige</name>
<url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url>
<dependencies>
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tags/3.1.0-rc2/framework/api/pom.xml
===================================================================
--- trunk/framework/api/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/framework/api/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -10,12 +10,12 @@
<parent>
<artifactId>framework</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Java Server Faces AJAX framework API</name>
<properties>
<jsfVersion>1.1</jsfVersion>
Modified: tags/3.1.0-rc2/framework/impl/pom.xml
===================================================================
--- trunk/framework/impl/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/framework/impl/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -10,12 +10,12 @@
<parent>
<artifactId>framework</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Java Server Faces AJAX framework implementation</name>
<build>
<resources>
@@ -283,7 +283,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<properties>
Modified: tags/3.1.0-rc2/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/framework/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,15 +1,13 @@
-<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">
+<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">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>framework</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>pom</packaging>
<name>Java Server Faces AJAX framework</name>
<dependencies />
Modified: tags/3.1.0-rc2/framework/test/pom.xml
===================================================================
--- trunk/framework/test/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/framework/test/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>framework</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>htmlunit</groupId>
Modified: tags/3.1.0-rc2/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -4,7 +4,7 @@
<artifactId>root</artifactId>
<packaging>pom</packaging>
<name>Jboss RichFaces project</name>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<url>http://labs.jboss.com/jbossrichfaces</url>
<dependencies />
<modules>
@@ -117,9 +117,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk</developerConnection>
- <url>http://anonsvn.jboss.org/repos/richfaces/trunk</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/3.1.0rc2</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/3.1.0rc2</developerConnection>
+ <url>https://svn.jboss.org/repos/richfaces/tags/3.1.0rc2</url>
</scm>
<profiles>
<profile>
Modified: tags/3.1.0-rc2/samples/calendar-sample/pom.xml
===================================================================
--- trunk/samples/calendar-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/calendar-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -3,29 +3,29 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>calendar-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>calendar-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>calendar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/dataFilterSliderDemo/pom.xml
===================================================================
--- trunk/samples/dataFilterSliderDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/dataFilterSliderDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,29 +2,29 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>dataFilterSliderDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>dataFilterSliderDemo Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataFilterSlider</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/dataTableDemo/pom.xml
===================================================================
--- trunk/samples/dataTableDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/dataTableDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>dataTableDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<url>http://maven.apache.org</url>
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/datascroller-sample/pom.xml
===================================================================
--- trunk/samples/datascroller-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/datascroller-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>datascroller-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>datascroller</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/dragDropDemo/pom.xml
===================================================================
--- trunk/samples/dragDropDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/dragDropDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>dragDropDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>Drag/Drop demo app</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>drag-drop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/dropdownmenu-sample/pom.xml
===================================================================
--- trunk/samples/dropdownmenu-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/dropdownmenu-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>dropdownmenu-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,17 +17,17 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dropdown-menu</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>menu-components</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/gmap-sample/pom.xml
===================================================================
--- trunk/samples/gmap-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/gmap-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,19 +2,19 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>gmap-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>gmap-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>gmap</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/inputNumberSliderDemo/pom.xml
===================================================================
--- trunk/samples/inputNumberSliderDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/inputNumberSliderDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>inputNumberSliderDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>inputnumber-slider</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/inputNumberSpinnerDemo/pom.xml
===================================================================
--- trunk/samples/inputNumberSpinnerDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/inputNumberSpinnerDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>inputNumberSpinnerDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>inputnumber-spinner</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/local-value-demo/pom.xml
===================================================================
--- trunk/samples/local-value-demo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/local-value-demo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,29 +1,29 @@
-<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">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>local-value-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>richfaces-local-value-demo Maven Webapp</name>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>richfaces-local-value-demo</finalName>
- </build>
-</project>
+<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">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-rc2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>local-value-demo</artifactId>
+ <version>3.1.0-rc2</version>
+ <packaging>war</packaging>
+ <name>richfaces-local-value-demo Maven Webapp</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-rc2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>richfaces-local-value-demo</finalName>
+ </build>
+</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/modalpanel-sample/pom.xml
===================================================================
--- trunk/samples/modalpanel-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/modalpanel-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,24 +2,24 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>modalpanel-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>modalpanel-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>modal-panel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/panel-sample/pom.xml
===================================================================
--- trunk/samples/panel-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/panel-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,24 +2,24 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>panel-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>panel-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>panel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/panelbar-sample/pom.xml
===================================================================
--- trunk/samples/panelbar-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/panelbar-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>panelbar-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>panelbar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/panelmenu-sample/pom.xml
===================================================================
--- trunk/samples/panelmenu-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/panelmenu-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -3,24 +3,24 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>panelmenu-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>panelmenu-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>panelmenu</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
Modified: tags/3.1.0-rc2/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,418 +1,418 @@
-<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">
- <parent>
- <artifactId>root</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>samples</artifactId>
- <packaging>pom</packaging>
- <name>RichFaces Components Examples</name>
- <version>3.1.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossrichfaces/samples</url>
- <properties>
- <!-- -->
- </properties>
- <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <!--
- -->
- <version>6.1.3</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
-
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>jsf1_1</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>jsfVersion</name>
- <value>1.1</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf1_2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>jsfVersion</name>
- <value>1.2</value>
- </property>
- </activation>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>tomcat5</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>tomcat6</id>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jboss42</id>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces</id>
- <properties>
- <myfaces>1.1.5</myfaces>
- <tomahawk>1.1.5</tomahawk>
- </properties>
- <build>
- <plugins />
- </build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <modules>
- <module>skins</module>
- <module>separator-sample</module>
- <module>panel-sample</module>
- <module>gmap-sample</module>
- <module>togglePanel-sample</module>
- <module>tabPanelDemo</module>
- <module>simpleTogglePanel-sample</module>
- <module>inputNumberSpinnerDemo</module>
- <module>inputNumberSliderDemo</module>
- <module>panelbar-sample</module>
- <module>toolBarDemo</module>
- <module>tree-demo</module>
- <module>dataFilterSliderDemo</module>
- <module>suggestionbox-sample</module>
- <module>dragDropDemo</module>
- <module>dataTableDemo</module>
- <module>modalpanel-sample</module>
- <module>datascroller-sample</module>
- <module>richfaces-demo</module>
- <module>dropdownmenu-sample</module>
- <module>tooltip-sample</module>
- <module>calendar-sample</module>
- <module>treeModelDemo</module>
- <module>local-value-demo</module>
- <!--
- <module>ajaxPortlet</module>
- -->
- <module>panelmenu-sample</module>
- <module>rich-message-demo</module>
- <!--module>scrollable-grid-demo</module-->
- </modules>
+<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">
+ <parent>
+ <artifactId>root</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-rc2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>samples</artifactId>
+ <packaging>pom</packaging>
+ <name>RichFaces Components Examples</name>
+ <version>3.1.0-rc2</version>
+ <url>http://labs.jboss.com/jbossrichfaces/samples</url>
+ <properties>
+ <!-- -->
+ </properties>
+ <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <!--
+ -->
+ <version>6.1.3</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>jsf1_1</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jsfVersion</name>
+ <value>1.1</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf1_2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jsfVersion</name>
+ <value>1.2</value>
+ </property>
+ </activation>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomcat5</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomcat6</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jboss42</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>myfaces</id>
+ <properties>
+ <myfaces>1.1.5</myfaces>
+ <tomahawk>1.1.5</tomahawk>
+ </properties>
+ <build>
+ <plugins />
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+ <modules>
+ <module>skins</module>
+ <module>separator-sample</module>
+ <module>panel-sample</module>
+ <module>gmap-sample</module>
+ <module>togglePanel-sample</module>
+ <module>tabPanelDemo</module>
+ <module>simpleTogglePanel-sample</module>
+ <module>inputNumberSpinnerDemo</module>
+ <module>inputNumberSliderDemo</module>
+ <module>panelbar-sample</module>
+ <module>toolBarDemo</module>
+ <module>tree-demo</module>
+ <module>dataFilterSliderDemo</module>
+ <module>suggestionbox-sample</module>
+ <module>dragDropDemo</module>
+ <module>dataTableDemo</module>
+ <module>modalpanel-sample</module>
+ <module>datascroller-sample</module>
+ <module>richfaces-demo</module>
+ <module>dropdownmenu-sample</module>
+ <module>tooltip-sample</module>
+ <module>calendar-sample</module>
+ <module>treeModelDemo</module>
+ <module>local-value-demo</module>
+ <!--
+ <module>ajaxPortlet</module>
+ -->
+ <module>panelmenu-sample</module>
+ <module>rich-message-demo</module>
+ <!--module>scrollable-grid-demo</module-->
+ </modules>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/rich-message-demo/pom.xml
===================================================================
--- trunk/samples/rich-message-demo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/rich-message-demo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -3,29 +3,29 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>rich-message-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>rich-message-demo</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>message</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
Modified: tags/3.1.0-rc2/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/richfaces-demo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,22 +1,20 @@
-<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">
+<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">
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>richfaces-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>richfaces-demo Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>com.uwyn</groupId>
@@ -26,7 +24,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: tags/3.1.0-rc2/samples/separator-sample/pom.xml
===================================================================
--- trunk/samples/separator-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/separator-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>separator-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>separator</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/simpleTogglePanel-sample/pom.xml
===================================================================
--- trunk/samples/simpleTogglePanel-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/simpleTogglePanel-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>simpleTogglePanel-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>simpleTogglePanel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/skins/pom.xml
===================================================================
--- trunk/samples/skins/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/skins/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,12 +1,12 @@
-<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">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>skins</artifactId>
- <name>skins</name>
- <dependencies />
+<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">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-rc2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>skins</artifactId>
+ <name>skins</name>
+ <dependencies />
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/suggestionbox-sample/pom.xml
===================================================================
--- trunk/samples/suggestionbox-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/suggestionbox-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>suggestionbox-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>suggestionbox-sample Maven Webapp</name>
<build>
@@ -17,17 +17,17 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>suggestionbox</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/tabPanelDemo/pom.xml
===================================================================
--- trunk/samples/tabPanelDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/tabPanelDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>tabPanelDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,22 +17,22 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tabPanel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>panel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/togglePanel-sample/pom.xml
===================================================================
--- trunk/samples/togglePanel-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/togglePanel-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>togglePanel-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,17 +17,17 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>togglePanel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>panel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/toolBarDemo/pom.xml
===================================================================
--- trunk/samples/toolBarDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/toolBarDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,12 +2,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>toolBarDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
<build>
@@ -17,12 +17,12 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>toolBar</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/samples/tooltip-sample/pom.xml
===================================================================
--- trunk/samples/tooltip-sample/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/tooltip-sample/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -3,24 +3,24 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>tooltip-sample</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>tooltip-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tooltip</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
Modified: tags/3.1.0-rc2/samples/tree-demo/pom.xml
===================================================================
--- trunk/samples/tree-demo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/tree-demo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,29 +2,29 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>tree-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>tree-demo Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tree</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>drag-drop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/samples/treeModelDemo/pom.xml
===================================================================
--- trunk/samples/treeModelDemo/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/samples/treeModelDemo/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -3,24 +3,24 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>treeModelDemo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<packaging>war</packaging>
<name>Tree Model Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>treeModel</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tree</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<build>
Modified: tags/3.1.0-rc2/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/assembly/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<configuration>
<library>
<prefix>org.richfaces</prefix>
Modified: tags/3.1.0-rc2/ui/calendar/pom.xml
===================================================================
--- trunk/ui/calendar/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/calendar/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<id>generate-sources</id>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
<profiles>
Modified: tags/3.1.0-rc2/ui/core/pom.xml
===================================================================
--- trunk/ui/core/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/core/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/dataFilterSlider/pom.xml
===================================================================
--- trunk/ui/dataFilterSlider/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/dataFilterSlider/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/dataTable/pom.xml
===================================================================
--- trunk/ui/dataTable/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/dataTable/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/datascroller/pom.xml
===================================================================
--- trunk/ui/datascroller/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/datascroller/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/drag-drop/pom.xml
===================================================================
--- trunk/ui/drag-drop/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/drag-drop/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/dropdown-menu/pom.xml
===================================================================
--- trunk/ui/dropdown-menu/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/dropdown-menu/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>menu-components</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/effect/pom.xml
===================================================================
--- trunk/ui/effect/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/effect/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/gmap/pom.xml
===================================================================
--- trunk/ui/gmap/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/gmap/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/inputnumber-slider/pom.xml
===================================================================
--- trunk/ui/inputnumber-slider/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/inputnumber-slider/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/inputnumber-spinner/pom.xml
===================================================================
--- trunk/ui/inputnumber-spinner/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/inputnumber-spinner/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: tags/3.1.0-rc2/ui/insert/pom.xml
===================================================================
--- trunk/ui/insert/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/insert/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,8 +1,8 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/menu-components/pom.xml
===================================================================
--- trunk/ui/menu-components/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/menu-components/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/message/pom.xml
===================================================================
--- trunk/ui/message/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/message/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,19 +2,19 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui</groupId>
<artifactId>message</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<name>Message</name>
<build>
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/modal-panel/pom.xml
===================================================================
--- trunk/ui/modal-panel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/modal-panel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/paint2D/pom.xml
===================================================================
--- trunk/ui/paint2D/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/paint2D/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/panel/pom.xml
===================================================================
--- trunk/ui/panel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/panel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<id>generate-sources</id>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/panelbar/pom.xml
===================================================================
--- trunk/ui/panelbar/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/panelbar/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: tags/3.1.0-rc2/ui/panelmenu/pom.xml
===================================================================
--- trunk/ui/panelmenu/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/panelmenu/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,259 +1,258 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <parent>
- <artifactId>root</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>ui</artifactId>
- <packaging>pom</packaging>
- <name>RichFaces Components</name>
- <properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
- <!-- -->
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <index>true</index>
- <manifest>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <mode>development</mode>
- <Build-Number>
- ${buildNumber}
- </Build-Number>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <modules>
- <module>core</module>
- <module>drag-drop</module>
- <module>effect</module>
- <module>panel</module>
- <module>panelbar</module>
- <module>dataFilterSlider</module>
- <module>gmap</module>
- <module>virtualEarth</module>
- <module>separator</module>
- <module>spacer</module>
- <module>paint2D</module>
- <module>togglePanel</module>
- <module>tabPanel</module>
- <module>simpleTogglePanel</module>
- <module>toolBar</module>
- <module>inputnumber-slider</module>
- <module>inputnumber-spinner</module>
- <module>tree</module>
- <module>suggestionbox</module>
- <module>dataTable</module>
- <module>modal-panel</module>
- <module>datascroller</module>
- <module>menu-components</module>
- <module>dropdown-menu</module>
- <module>tooltip</module>
- <module>panelmenu</module>
- <module>calendar</module>
- <module>treeModel</module>
- <module>message</module>
- <module>scrollableDataTable</module>
- <module>insert</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet.jsp</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jstl</artifactId>
- <groupId>javax.servlet.jsp.jstl</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>jsp-api</artifactId>
- <groupId>javax.servlet.jsp</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jstl</artifactId>
- <groupId>javax.servlet.jsp.jstl</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-test</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- --><!--
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- -->
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- -->
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- </plugin>
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <xmlOutput>false</xmlOutput>
- <threshold>Normal</threshold>
- <effort>Max</effort>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- <distributionManagement>
- <repository>
- <uniqueVersion>false</uniqueVersion>
- <id>release-repository</id>
- <url>${releaseRepository}</url>
- </repository>
- <snapshotRepository>
- <id>snap-repository</id>
- <url>${snapshotRepository}</url>
- </snapshotRepository>
- <site>
- <id>richfaces-site</id>
- <url>richfaces/</url>
- </site>
- <downloadUrl>
- http://labs.jboss.com/portal/jbossrichfaces/downloads
- </downloadUrl>
- </distributionManagement>
- <profiles>
- </profiles>
+<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">
+ <parent>
+ <artifactId>root</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-rc2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>ui</artifactId>
+ <packaging>pom</packaging>
+ <name>RichFaces Components</name>
+ <properties>
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <!-- -->
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+ <addDefaultSpecificationEntries>
+ true
+ </addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <mode>development</mode>
+ <Build-Number>
+ ${buildNumber}
+ </Build-Number>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <modules>
+ <module>core</module>
+ <module>drag-drop</module>
+ <module>effect</module>
+ <module>panel</module>
+ <module>panelbar</module>
+ <module>dataFilterSlider</module>
+ <module>gmap</module>
+ <module>virtualEarth</module>
+ <module>separator</module>
+ <module>spacer</module>
+ <module>paint2D</module>
+ <module>togglePanel</module>
+ <module>tabPanel</module>
+ <module>simpleTogglePanel</module>
+ <module>toolBar</module>
+ <module>inputnumber-slider</module>
+ <module>inputnumber-spinner</module>
+ <module>tree</module>
+ <module>suggestionbox</module>
+ <module>dataTable</module>
+ <module>modal-panel</module>
+ <module>datascroller</module>
+ <module>menu-components</module>
+ <module>dropdown-menu</module>
+ <module>tooltip</module>
+ <module>panelmenu</module>
+ <module>calendar</module>
+ <module>treeModel</module>
+ <module>message</module>
+ <module>scrollableDataTable</module>
+ <module>insert</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.1_02</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.1_02</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-test</artifactId>
+ <version>3.1.0-rc2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.10</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.12</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>
+ maven-project-info-reports-plugin
+ </artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ --><!--
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>changelog-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <xmlOutput>false</xmlOutput>
+ <threshold>Normal</threshold>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <repository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>release-repository</id>
+ <url>${releaseRepository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snap-repository</id>
+ <url>${snapshotRepository}</url>
+ </snapshotRepository>
+ <site>
+ <id>richfaces-site</id>
+ <url>richfaces/</url>
+ </site>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ </distributionManagement>
+ <profiles>
+ </profiles>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/scrollableDataTable/pom.xml
===================================================================
--- trunk/ui/scrollableDataTable/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/scrollableDataTable/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -1,76 +1,74 @@
-<?xml version="1.0"?><project>
- <parent>
- <artifactId>ui</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>scrollable-grid</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <name>Scrollable Grid</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <library>
- <prefix>org.richfaces</prefix>
- <taglib>
- <shortName>scrollableDataTable</shortName>
- </taglib>
- </library>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/generatescript.xml" inheritRefs="true">
- <target name="merge-scripts" />
- <property name="target-dir"
- value="${project.build.directory}/generated-component/resources">
- </property>
- <property name="resources-dir"
- value="${basedir}/src/main/javascript">
- </property>
- </ant>
- </tasks>
- <resourceRoot>
- ${project.build.directory}/generated-component/resources
- </resourceRoot>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>dataTable</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+<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">
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-rc2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>scrollable-grid</artifactId>
+ <version>3.1.0-rc2</version>
+ <name>Scrollable Grid</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>3.1.0-rc2</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <shortName>scrollableDataTable</shortName>
+ </taglib>
+ </library>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/generatescript.xml" inheritRefs="true">
+ <target name="merge-scripts" />
+ <property name="target-dir" value="${project.build.directory}/generated-component/resources">
+ </property>
+ <property name="resources-dir" value="${basedir}/src/main/javascript">
+ </property>
+ </ant>
+ </tasks>
+ <resourceRoot>
+ ${project.build.directory}/generated-component/resources
+ </resourceRoot>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>dataTable</artifactId>
+ <version>3.1.0-rc2</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/separator/pom.xml
===================================================================
--- trunk/ui/separator/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/separator/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: tags/3.1.0-rc2/ui/simpleTogglePanel/pom.xml
===================================================================
--- trunk/ui/simpleTogglePanel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/simpleTogglePanel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/spacer/pom.xml
===================================================================
--- trunk/ui/spacer/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/spacer/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/suggestionbox/pom.xml
===================================================================
--- trunk/ui/suggestionbox/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/suggestionbox/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/tabPanel/pom.xml
===================================================================
--- trunk/ui/tabPanel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/tabPanel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/togglePanel/pom.xml
===================================================================
--- trunk/ui/togglePanel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/togglePanel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/toolBar/pom.xml
===================================================================
--- trunk/ui/toolBar/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/toolBar/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/tooltip/pom.xml
===================================================================
--- trunk/ui/tooltip/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/tooltip/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/tree/pom.xml
===================================================================
--- trunk/ui/tree/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/tree/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>drag-drop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/treeModel/pom.xml
===================================================================
--- trunk/ui/treeModel/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/treeModel/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<id>generate-sources</id>
@@ -45,12 +45,12 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>tree</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: tags/3.1.0-rc2/ui/virtualEarth/pom.xml
===================================================================
--- trunk/ui/virtualEarth/pom.xml 2007-08-15 22:48:54 UTC (rev 2281)
+++ tags/3.1.0-rc2/ui/virtualEarth/pom.xml 2007-08-15 23:29:33 UTC (rev 2282)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</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.1.0-SNAPSHOT</version>
+ <version>3.1.0-rc2</version>
<executions>
<execution>
<phase>generate-sources</phase>
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2281 - in trunk/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: SergeySmirnov
Date: 2007-08-15 18:48:54 -0400 (Wed, 15 Aug 2007)
New Revision: 2281
Added:
trunk/samples/richfaces-demo/src/main/webapp/images/cn_insert.gif
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/examples/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/examples/ajaxSubmit.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/snippets/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/snippets/commandLinkProblem.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipBlock.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipsPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/clickme.gif
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/cn_include.gif
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxSamples/rsBean.java
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/images/cn_Include.gif
trunk/samples/richfaces-demo/src/main/webapp/images/cn_jsFunction.gif
trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml
Log:
demo updates
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxSamples/rsBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxSamples/rsBean.java 2007-08-15 22:20:20 UTC (rev 2280)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxSamples/rsBean.java 2007-08-15 22:48:54 UTC (rev 2281)
@@ -4,7 +4,10 @@
private Integer addent1;
private Integer addent2;
private Integer sum;
+ private String text1;
+ private String text2;
+
public Integer getSum() {
return sum;
}
@@ -27,5 +30,17 @@
sum = new Integer((addent1 != null ? addent1.intValue() : 0) + (addent2 != null ? addent2.intValue() : 0));
return null;
}
+ public String getText1() {
+ return text1;
+ }
+ public void setText1(String text1) {
+ this.text1 = text1;
+ }
+ public String getText2() {
+ return text2;
+ }
+ public void setText2(String text2) {
+ this.text2 = text2;
+ }
}
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-15 22:20:20 UTC (rev 2280)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-15 22:48:54 UTC (rev 2281)
@@ -37,6 +37,7 @@
message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, RichFacesComponentsLibrary.html#message, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessage.html, /richfaces/comingSoon.jsf
messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, RichFacesComponentsLibrary.html#messages, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessages.html, /richfaces/comingSoon.jsf
virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, RichFacesComponentsLibrary.html#virtualEarth, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/comingSoon.jsf
+insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf
scrollableGrid= richDataIterators, Scrollable Data Grid, /images/ico_common.gif, /images/cn_ScrollableDataGrid.gif, RichFacesComponentsLibrary.html#scrollableGrid, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableGrid, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableGrid.html, /richfaces/comingSoon.jsf
ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, jbossajax4jsf/freezone/docs/tlddoc/overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf
actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, RichFacesComponentsLibrary.html#actionparam, jbossajax4jsf/freezone/docs/tlddoc/a4j/actionparam.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIActionParameter.html, /richfaces/actionparam.jsf
@@ -44,7 +45,7 @@
commandLink= ajaxSupport, Command Link, /images/ico_common.gif, /images/cn_commandLink.gif, RichFacesComponentsLibrary.html#commandLink, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandLink.html, /richfaces/commandLink.jsf
form= ajaxSupport, Ajax Form, /images/ico_common.gif, /images/cn_ajaxForm.gif, RichFacesComponentsLibrary.html#form, jbossajax4jsf/freezone/docs/tlddoc/a4j/form.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxForm.html, /richfaces/form.jsf
support= ajaxSupport, Ajax Support, /images/ico_common.gif, /images/cn_ajaxSupport.gif, RichFacesComponentsLibrary.html#support, jbossajax4jsf/freezone/docs/tlddoc/a4j/support.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxSupport.html, /richfaces/support.jsf
-jsFunction= ajaxSupport, JavaScript Function, /images/ico_common.gif, /images/cn_jsFunction.gif, RichFacesComponentsLibrary.html#jsFunction, jbossajax4jsf/freezone/docs/tlddoc/a4j/jsFunction.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxFunction.html, /richfaces/jsFunction.jsf
+jsFunction= ajaxSupport, JS Function, /images/ico_common.gif, /images/cn_jsFunction.gif, RichFacesComponentsLibrary.html#jsFunction, jbossajax4jsf/freezone/docs/tlddoc/a4j/jsFunction.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxFunction.html, /richfaces/jsFunction.jsf
poll= ajaxSupport, Poll, /images/ico_common.gif, /images/cn_poll.gif, RichFacesComponentsLibrary.html#poll, jbossajax4jsf/freezone/docs/tlddoc/a4j/poll.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPoll.html, /richfaces/poll.jsf
push= ajaxSupport, Push, /images/ico_common.gif, /images/cn_push.gif, RichFacesComponentsLibrary.html#push, jbossajax4jsf/freezone/docs/tlddoc/a4j/push.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPush.html, /richfaces/comingSoon.jsf
status= ajaxSupport, Status, /images/ico_common.gif, /images/cn_status.gif, RichFacesComponentsLibrary.html#status, jbossajax4jsf/freezone/docs/tlddoc/a4j/status.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxStatus.html, /richfaces/status.jsf
@@ -56,7 +57,7 @@
keepAlive= ajaxResources, Keep Alive, /images/ico_common.gif, /images/cn_KeepAlive.gif, RichFacesComponentsLibrary.html#keepAlive, jbossajax4jsf/freezone/docs/tlddoc/a4j/keepAlive.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.html, /richfaces/keepAlive.jsf
include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_Include.gif, RichFacesComponentsLibrary.html#include, jbossajax4jsf/freezone/docs/tlddoc/a4j/include.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIInclude.html, /richfaces/comingSoon.jsf
mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_MediaOutput.gif, RichFacesComponentsLibrary.html#mediaOutput, jbossajax4jsf/freezone/docs/tlddoc/a4j/mediaOutput.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html, /richfaces/comingSoon.jsf
-outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, RichFacesComponentsLibrary.html#outputPanel, jbossajax4jsf/freezone/docs/tlddoc/a4j/outputPanel.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html, /richfaces/comingSoon.jsf
+outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, RichFacesComponentsLibrary.html#outputPanel, jbossajax4jsf/freezone/docs/tlddoc/a4j/outputPanel.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html, /richfaces/outputPanel.jsf
repeat= richDataIterators, Repeat, /images/ico_common.gif, /images/cn_Repeat.gif, RichFacesComponentsLibrary.html#repeat, jbossajax4jsf/freezone/docs/tlddoc/a4j/repeat.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html, /richfaces/comingSoon.jsf
htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_HtmlCommandLink.gif, RichFacesComponentsLibrary.html#htmlCommandLink, jbossajax4jsf/freezone/docs/tlddoc/a4j/htmlCommandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.html, /richfaces/comingSoon.jsf
log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/comingSoon.jsf
Modified: trunk/samples/richfaces-demo/src/main/webapp/images/cn_Include.gif
===================================================================
(Binary files differ)
Added: trunk/samples/richfaces-demo/src/main/webapp/images/cn_insert.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/cn_insert.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/samples/richfaces-demo/src/main/webapp/images/cn_jsFunction.gif
===================================================================
(Binary files differ)
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/examples/ajaxSubmit.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/examples/ajaxSubmit.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/examples/ajaxSubmit.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,37 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <h:panelGrid columns="2">
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Form with ajaxSubmit equals true"/>
+ </f:facet>
+
+ <a4j:form ajaxSubmit="true" reRender="name">
+ <h:panelGrid>
+ <h:commandButton value="Set Local Name to John (Ajax)" action="#{userBean.nameItJohn}" />
+ <h:outputText id="name" value="Name:#{userBean.name}" />
+ </h:panelGrid>
+ </a4j:form>
+ </rich:panel>
+
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Form with ajaxSubmit equals false"/>
+ </f:facet>
+
+ <a4j:form>
+ <h:panelGrid>
+ <h:commandButton value="Set Both Name to Mark (non-Ajax)" action="#{userBean.nameItMark}" />
+ <h:outputText id="name" value="Name:#{userBean.name}" />
+ </h:panelGrid>
+ </a4j:form>
+
+ </rich:panel>
+
+ </h:panelGrid>
+</ui:composition>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/snippets/commandLinkProblem.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/snippets/commandLinkProblem.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/snippets/commandLinkProblem.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,13 @@
+ ....
+ <-- This code does not work correctly after the link is re-rendered -->
+ <h:form>
+ ....
+ <a4j:commandButton value="Update Non-Ajax Link" reRender="panel" />
+ ....
+ <h:panelGrid id="panel">
+ ....
+ <h:commandLink value="Non-Ajax Submit" action="foo" />
+ ....
+ </h:panelGrid>
+ ....
+ </h:form>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/usage.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert/usage.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+ <ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+ <p>placeholder</p>
+ </ui:define>
+
+ </ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/insert.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Page Insert</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/insert/usage.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,75 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <style type="text/css">
+ .col {
+ width:50%;
+ padding:10px;
+ }
+ </style>
+
+ <rich:separator height="1" style="10px 0"/>
+
+ <h:panelGrid columns="2" width="100%" columnClasses="col">
+
+ <h:panelGroup>
+ This code does not work as expected. The expected echo text does not appear
+ below even the condition for <code>'renderer'</code> returns <code>true</code>.
+ Also, the error message does not appear when the length of the text reaches the limit.
+ </h:panelGroup>
+
+ <h:panelGroup>
+ This code works properly. The <code>h:message</code> is marked for update during
+ each Ajaxrequest/response. The place for bottom label is reserved with
+ <code>outputPanel</code> while the component is not rendered.
+ </h:panelGroup>
+
+ <a4j:outputPanel layout="block">
+
+ <h:message for="text1" style="color:red" />
+
+ <a4j:outputPanel layout="block">
+ <h:form>
+ <h:outputText value="Enter Text:"/>
+ <h:inputText id="text1" label="text1" value="#{rsBean.text1}">
+ <f:validateLength maximum="10"/>
+ <a4j:support event="onkeyup" reRender="out1" />
+ </h:inputText>
+ </h:form>
+ </a4j:outputPanel>
+
+ <h:outputText id="out1" rendered="#{not empty rsBean.text1}" value="Approved Text: #{rsBean.text2}" />
+
+ </a4j:outputPanel>
+
+
+
+ <a4j:outputPanel layout="block">
+
+ <a4j:outputPanel ajaxRendered="true">
+ <h:message for="text2" style="color:red" />
+ </a4j:outputPanel>
+
+ <a4j:outputPanel layout="block">
+ <h:form>
+ <h:outputText value="Enter Text:"/>
+ <h:inputText id="text2" label="text1" value="#{rsBean.text2}">
+ <f:validateLength maximum="10"/>
+ <a4j:support event="onkeyup" reRender="out2" />
+ </h:inputText>
+ </h:form>
+ </a4j:outputPanel>
+
+ <a4j:outputPanel layout="none">
+ <h:outputText id="out2" rendered="#{not empty rsBean.text2}" value="Approved Text: #{rsBean.text2}" />
+ </a4j:outputPanel>
+ </a4j:outputPanel>
+ </h:panelGrid>
+
+ <rich:separator height="1" style="10px 0"/>
+
+</ui:composition>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/usage.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/usage.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+ <ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+
+
+ <p><code>a4j:outputPanel</code> is rendered as a <span> html element if the
+ <code>'layout'</code> attribute is equal <code>'inline'</code>
+ (default value) or as a <div> html element if <code>layout="block"</code>.
+ You can use this component for a layout purpose even the page has no Ajax functionality.
+ </p>
+ <p>In case of Ajax functionality presents on the page, the component offects two additional
+ features:
+ <ul>
+ <li>Marking the area of the page as automatically re-rendered on each Ajax request event
+ without a nessesity necessity to mentioned this area in the <code>reRender</code> attribute of Ajax
+ component. Attribute <code>ajaxRendered="true"</code> turn on this future. Note, that the effect of using
+ ajaxRendered="true" still might be overrided with limitToList attribute of the Ajax component
+ or <code>renderRegionOnly</code> attribute of the <code>a4j:region</code> component.</li>
+ <li>Marking the placeholder for any JSF component in case of it is not rendered due to
+ <code>rendered="false"</code>. This might be important when the component becomes rendered during the next
+ Ajax response. As soon as the placeholder is unknown, the rendered component will not appear
+ appear on the page. To turn on the feature of marking the placeholder you need to have the
+ attribute <code>layout="none"</code>.</li>
+ </ul>
+ </p>
+ <p>When <code>layout="none"</code>, the span <code>style="display:none"</code> is
+ rendered and assign the id of the child component if the component is not rendered.
+ Otherwize, it does not rendered at all.<br/>
+ The following example shows the cases of usage described above:</p>
+ <div class="sample-container" >
+
+ <ui:include src="/richfaces/outputPanel/examples/noneLayout.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/outputPanel/examples/noneLayout.xhtml"/>
+ </ui:include>
+
+ </div>
+ </ui:define>
+
+ </ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Output Panel</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/outputPanel/usage.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipBlock.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipBlock.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipBlock.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,28 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+
+
+ <f:subview>
+ <h:panelGrid styleClass="infopanel" cellpadding="0" cellspacing="0" columnClasses="col"
+ rowClasses="row1, row2,row3" border="0" columns="1">
+
+ <h:outputText value="#{tip}" />
+
+ <rich:separator height="1" />
+
+ <h:panelGrid columns="3">
+ <rich:toggleControl value="x Close" switchToState="closed" />
+ <rich:toggleControl switchToState="#{previous}" value="#{empty previous? '': '« Previous'}" />
+ <rich:toggleControl switchToState="#{next}" value="#{empty next? '': 'Next »'}" />
+ </h:panelGrid>
+
+ </h:panelGrid>
+ </f:subview>
+
+
+</ui:composition>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipsPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipsPanel.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/examples/tipsPanel.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -0,0 +1,60 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <style>
+
+ .infopanel { border:2px solid #{richSkin.panelBorderColor}; }
+ .row1 { height:60px; }
+ .row1 .col { padding:10px; }
+ .row2 { height:2px; }
+ .row3 { height:20px; }
+ .row3 .col {text-align:left; }
+ .col { }
+ </style>
+
+ <rich:togglePanel value="#{toggleBean.skinChooserState1}" switchType="client"
+ stateOrder="closed,tip1, tip2,tip3">
+
+ <f:facet name="closed">
+ <rich:toggleControl>
+ <h:graphicImage id="pic" style="border-width:0" value="/richfaces/togglePanel/picture/clickme.gif" />
+ </rich:toggleControl>
+ </f:facet>
+
+ <f:facet name="tip1">
+ <ui:include src="/richfaces/togglePanel/examples/tipBlock.xhtml">
+ <ui:param name="tip" value="rich:toggleControl might bre located inside of outside
+ of the rich:toogleControl it works for. In case of outside location, the control
+ attribute 'for' should refer to the toggle panel id."/>
+ <ui:param name="next" value="tip2"/>
+ </ui:include>
+ </f:facet>
+
+ <f:facet name="tip2">
+ <ui:include src="/richfaces/togglePanel/examples/tipBlock.xhtml">
+ <ui:param name="tip" value="Attribute initialState defines the first state appear
+ when the page is loaded. If this attribute is not specified, the first state
+ mentioned in the attribute stateOrder will be the first"/>
+ <ui:param name="previous" value="tip1"/>
+ <ui:param name="next" value="tip3"/>
+ </ui:include>
+ </f:facet>
+
+ <f:facet name="tip3">
+ <ui:include src="/richfaces/togglePanel/examples/tipBlock.xhtml">
+ <ui:param name="tip" value="Note that rich:toggleControl similar to
+ h:commandLink for 'server' mode and smilar to a4j:commandLink for 'ajax' mode.
+ Set immediate attribute to true if jsf form has other input field that might
+ cause the validation error. Otherwize, the state switched will not perform"/>
+ <ui:param name="previous" value="tip2"/>
+ </ui:include>
+ </f:facet>
+
+ </rich:togglePanel>
+
+
+</ui:composition>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/clickme.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/clickme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/cn_include.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/picture/cn_include.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml 2007-08-15 22:20:20 UTC (rev 2280)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/togglePanel/usage.xhtml 2007-08-15 22:48:54 UTC (rev 2281)
@@ -7,78 +7,42 @@
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
- <p>
- Toggle Panel renders sequence of contents, tha can be switchet (toggled) by component called Toggle Control.
- </p>
- <ul>
- <li>Native support for Ajax operations</li>
- <li>Support for "ajax", "client" and "server" switch types</li>
- </ul>
- <h:form>
- <div class="sample-container" >
- <p>
- This is a simple example that contain two panels that can be switched. It is simplified version of elemet above on the screen that allows change of skin for this application.
- </p>
- <rich:togglePanel id="skin_chooser1" value="#{toggleBean.skinChooserState1}" switchType="ajax" stateOrder="s,b">
- <f:facet name="s">
- <h:panelGrid columns="1">
- <h:outputText value="BlueSky" />
- <h:outputText value="Classic" />
- <rich:toggleControl for="skin_chooser1" value="more »" />
- </h:panelGrid>
- </f:facet>
- <f:facet name="b">
- <h:panelGrid columns="1">
- <h:outputText value="BlueSky" />
- <h:outputText value="Classic" />
- <h:outputText value="Ruby" />
- <h:outputText value="Wine" />
- <h:outputText value="DeepMarine" />
- <h:outputText value="EmeraldTown" />
- <h:outputText value="Sakura" />
- <h:outputText value="Default" />
- <rich:toggleControl for="skin_chooser1" value="« less" />
- </h:panelGrid>
- </f:facet>
- </rich:togglePanel>
- </div>
- <div class="sample-container" >
- <p>
- This is another example, now it uses "server" switch type.
- </p>
- <rich:togglePanel id="skin_chooser2" value="#{toggleBean.skinChooserState3}" switchType="server" stateOrder="s,b">
- <f:facet name="s">
- <h:panelGrid columns="1">
- <h:outputText value="BlueSky" />
- <h:outputText value="Classic" />
- <rich:toggleControl for="skin_chooser2" value="more »" />
- </h:panelGrid>
- </f:facet>
- <f:facet name="b">
- <h:panelGrid columns="1">
- <h:outputText value="BlueSky" />
- <h:outputText value="Classic" />
- <h:outputText value="Ruby" />
- <h:outputText value="Wine" />
- <h:outputText value="DeepMarine" />
- <h:outputText value="EmeraldTown" />
- <h:outputText value="Sakura" />
- <h:outputText value="Default" />
- <rich:toggleControl for="skin_chooser2" value="« less" />
- </h:panelGrid>
- </f:facet>
- </rich:togglePanel>
- </div>
- </h:form>
- <p>
- Note how tree switched on "client" does not "remember" it state when whole page is reloaded. At the same time "ajax" tree remember it state without any additional code.
- </p>
+ <p>
+ Toggle Panel renders sequence of states, tha can be switched (toggled) by
+ component called Toggle Control. rich:togglePanel has no default appearance.
+ You can define it using the set of facets with any given content inside.
+ </p>
+ <p>
+ <b>switchType</b> attribute define the strategy of switching. The possible values for this attributes
+ are:
+ <ul>
+ <li>client - switching happens on the client without any request to the server.
+ The jsf form is not required in this mode</li>
+ <li>ajax - when state are switched, the content of new states comes from the server in Ajax way.</li>
+ <li>server - the whole page is reloaded when states are switched</li>
+ </ul>
+ </p>
+ <p>
+ <b>stateOrder</b> attribute defines the order of the states if "switchToState" attribute of
+ rich:toggleControl. The following example shows tips panel having one closed state and
+ three states for tips.
+ </p>
+
+
+ <div class="sample-container">
+
+ <ui:include src="/richfaces/togglePanel/examples/tipsPanel.xhtml"/>
+
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/togglePanel/examples/tipsPanel.xhtml"/>
+ <ui:param name="openlabel" value="View Page Source"/>
+ </ui:include>
+
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/togglePanel/examples/tipBlock.xhtml"/>
+ <ui:param name="openlabel" value="View TipBlock.xhtml Source"/>
+ </ui:include>
+ </div>
</ui:define>
- <ui:define name="sources">
- <p>
- Here is fragment of page sources for given example:
- </p>
- <iframe src="${facesContext.externalContext.requestContextPath}/richfaces/togglePanel/source/usage.html" class="source_frame"/>
- </ui:define>
</ui:composition>
</html>
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2280 - in trunk: framework/impl/src/main/javascript/ajaxjsf and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-15 18:20:20 -0400 (Wed, 15 Aug 2007)
New Revision: 2280
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/extended-data-model.xhtml
Log:
fix state save/restore in subtable.
Fix exception in IE on clear old node content by innerHTML .
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-15 19:44:05 UTC (rev 2279)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-15 22:20:20 UTC (rev 2280)
@@ -506,7 +506,7 @@
*/
protected void setExtendedDataModel(ExtendedDataModel model) {
this._currentModel = model;
- // this._modelsMap.put(getBaseClientId(getFacesContext()), model);
+ this._modelsMap.put(getBaseClientId(getFacesContext()), model);
}
/**
@@ -518,14 +518,13 @@
*/
protected ExtendedDataModel getExtendedDataModel() {
if (this._currentModel == null) {
- // String baseClientId = getBaseClientId(getFacesContext());
+ String baseClientId = getBaseClientId(getFacesContext());
ExtendedDataModel model;
- // model = (ExtendedDataModel) this._modelsMap
- // .get(baseClientId);
- // if (null == model) {
- model = createDataModel();
- // this._modelsMap.put(baseClientId, model);
- // }
+ model = (ExtendedDataModel) this._modelsMap.get(baseClientId);
+ if (null == model) {
+ model = createDataModel();
+ this._modelsMap.put(baseClientId, model);
+ }
this._currentModel = model;
}
return this._currentModel;
@@ -547,8 +546,8 @@
*/
public void setComponentState(DataComponentState state) {
this._currentState = state;
- // this._statesMap.put(getBaseClientId(getFacesContext()),
- // this._currentState);
+ this._statesMap.put(getBaseClientId(getFacesContext()),
+ this._currentState);
}
/**
@@ -559,8 +558,8 @@
if (this._currentState == null) {
// Check for binding state to user bean.
ValueBinding valueBinding = getValueBinding(UIDataAdaptor.COMPONENT_STATE_ATTRIBUTE);
+ FacesContext facesContext = getFacesContext();
if (null != valueBinding) {
- FacesContext facesContext = getFacesContext();
state = (DataComponentState) valueBinding
.getValue(facesContext);
if (null == state) {
@@ -573,14 +572,13 @@
}
} else {
// Check for stored state in map for parent iterations
- // String baseClientId = getBaseClientId(facesContext);
- // state = (DataComponentState)
- // this._statesMap.get(baseClientId);
- // if (null == state) {
- // Create default component state
- state = createComponentState();
- // this._statesMap.put(baseClientId, state);
- // }
+ String baseClientId = getBaseClientId(facesContext);
+ state = (DataComponentState) this._statesMap.get(baseClientId);
+ if (null == state) {
+ // Create default component state
+ state = createComponentState();
+ this._statesMap.put(baseClientId, state);
+ }
this._currentState = state;
}
} else {
@@ -659,8 +657,9 @@
public void setId(String id) {
// If component created by restoring tree or JSP, initial Id is null.
boolean haveId = null != super.getId();
- String baseClientId = haveId ? getBaseClientId(getFacesContext())
- : null;
+ String baseClientId;
+// baseClientId = haveId ? getBaseClientId(getFacesContext())
+// : null;
super.setId(id);
_baseClientId = null;
_clientId = null;
@@ -670,9 +669,9 @@
// we use it for
// switch to different model and state.
// Step one - save old values.
- this._statesMap.put(baseClientId, this._currentState);
- this._modelsMap.put(baseClientId, this._currentModel);
- this._ajaxRowKeysMap.put(baseClientId, this._ajaxRowKey);
+// this._statesMap.put(baseClientId, this._currentState);
+// this._modelsMap.put(baseClientId, this._currentModel);
+// this._ajaxRowKeysMap.put(baseClientId, this._ajaxRowKey);
// Step two - restore values for a new clientId.
baseClientId = getBaseClientId(getFacesContext());
this._currentState = (DataComponentState) this._statesMap
@@ -1288,10 +1287,6 @@
this._statesMap.put(key, compState);
this._modelsMap.put(key, idState.model);
}
- this._currentState = (DataComponentState) _statesMap
- .get(getBaseClientId(faces));
- this._currentModel = (ExtendedDataModel) _modelsMap
- .get(getBaseClientId(faces));
}
public Object saveState(FacesContext faces) {
@@ -1304,8 +1299,8 @@
Set encodedIds = getEncodedIds();
// Save all states of component and data model for all valies of
// clientId, encoded in this request.
- this._statesMap.put(getBaseClientId(faces), this._currentState);
- this._modelsMap.put(getBaseClientId(faces), this._currentModel);
+// this._statesMap.put(getBaseClientId(faces), this._currentState);
+// this._modelsMap.put(getBaseClientId(faces), this._currentModel);
for (Iterator iter = this._statesMap.entrySet().iterator(); iter
.hasNext();) {
Map.Entry stateEntry = (Map.Entry) iter.next();
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 19:44:05 UTC (rev 2279)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 22:20:20 UTC (rev 2280)
@@ -291,7 +291,12 @@
var anchor = oldnode.parentNode;
if(oldnode.outerHTML && !oldnode.tagName.match( /(tbody|thead|tfoot|tr|th|td)/i ) ){
LOG.debug("Replace content of node by outerHTML()");
- oldnode.innerHTML = "";
+ try {
+ oldnode.innerHTML = "";
+ } catch(e){
+ LOG.error("Error to clear node content by innerHTML");
+ Sarissa.clearChildNodes(oldnode);
+ }
oldnode.outerHTML = new XMLSerializer().serializeToString(newnode);
} else {
var importednode ;
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-08-15 19:44:05 UTC (rev 2279)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-08-15 22:20:20 UTC (rev 2280)
@@ -54,6 +54,7 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml 2007-08-15 19:44:05 UTC (rev 2279)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml 2007-08-15 22:20:20 UTC (rev 2280)
@@ -4,8 +4,9 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
-
- <rich:messages />
+
+ <rich:messages />
+
<h:form>
<rich:datascroller for="auction" maxPages="5"/>
<rich:spacer height="30" />
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/extended-data-model.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/extended-data-model.xhtml 2007-08-15 19:44:05 UTC (rev 2279)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/extended-data-model.xhtml 2007-08-15 22:20:20 UTC (rev 2280)
@@ -18,7 +18,7 @@
</ui:include>
<ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/demosrc/org/richfaces/datatable/ExpenseReport.java"/>
+ <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/datatable/ExpenseReport.java"/>
<ui:param name="openlabel" value="View Page Source" />
</ui:include>
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2279 - trunk/framework/impl/src/main/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-15 15:44:05 -0400 (Wed, 15 Aug 2007)
New Revision: 2279
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
Log:
Fix dataTable save/restoreState problem.
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-15 19:09:33 UTC (rev 2278)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-15 19:44:05 UTC (rev 2279)
@@ -659,7 +659,8 @@
public void setId(String id) {
// If component created by restoring tree or JSP, initial Id is null.
boolean haveId = null != super.getId();
- String baseClientId = haveId?getBaseClientId(getFacesContext()):null;
+ String baseClientId = haveId ? getBaseClientId(getFacesContext())
+ : null;
super.setId(id);
_baseClientId = null;
_clientId = null;
@@ -670,7 +671,7 @@
// switch to different model and state.
// Step one - save old values.
this._statesMap.put(baseClientId, this._currentState);
- this._modelsMap.put(baseClientId,this._currentModel);
+ this._modelsMap.put(baseClientId, this._currentModel);
this._ajaxRowKeysMap.put(baseClientId, this._ajaxRowKey);
// Step two - restore values for a new clientId.
baseClientId = getBaseClientId(getFacesContext());
@@ -974,7 +975,7 @@
public void processUpdates(FacesContext faces) {
processUpdates(faces, null);
-// resetComponent(faces);
+ // resetComponent(faces);
}
protected void processValidators(FacesContext faces, Object argument) {
@@ -989,9 +990,9 @@
public void encodeBegin(FacesContext context) throws IOException {
resetDataModel();
- if(!keepSaved(context)){
- childState.remove(getBaseClientId(context));
- }
+ if (!keepSaved(context)) {
+ childState.remove(getBaseClientId(context));
+ }
// Mark component as used, if parent UIData change own range states not
// accessed at
// encode phase must be unsaved.
@@ -1132,7 +1133,7 @@
// For Ajax events, keep row value.
if (!(rowEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)) {
this._ajaxRowKey = eventRowKey;
-// this._ajaxRowKeysMap.put(getBaseClientId(faces), eventRowKey);
+ // this._ajaxRowKeysMap.put(getBaseClientId(faces), eventRowKey);
}
setRowKey(faces, oldRowKey);
restoreOrigValue(faces);
@@ -1287,8 +1288,10 @@
this._statesMap.put(key, compState);
this._modelsMap.put(key, idState.model);
}
- this._currentState = (DataComponentState) _statesMap.get(getBaseClientId(faces));
- this._currentModel = (ExtendedDataModel) _modelsMap.get(getBaseClientId(faces));
+ this._currentState = (DataComponentState) _statesMap
+ .get(getBaseClientId(faces));
+ this._currentModel = (ExtendedDataModel) _modelsMap
+ .get(getBaseClientId(faces));
}
public Object saveState(FacesContext faces) {
@@ -1311,20 +1314,25 @@
Object stateKey = stateEntry.getKey();
if (encodedIds.isEmpty() || encodedIds.contains(stateKey)) {
PerIdState idState = new PerIdState();
- idState.model = getExtendedDataModel().getSerializableModel(
- dataComponentState.getRange());
// Save component state , depended if implemented interfaces.
if (null == dataComponentState) {
idState.componentState = null;
- } else if (dataComponentState instanceof Serializable) {
- idState.componentState = dataComponentState;
- } else if (dataComponentState instanceof StateHolder) {
- // TODO - change RichFaces Tree component, for remove
- // reference to component from state.
- // Change this code to reference for saveAttachedState.
- idState.componentState = ((StateHolder) dataComponentState)
- .saveState(faces);
- idState.stateInHolder = true;
+ } else {
+ if (dataComponentState instanceof Serializable) {
+ idState.componentState = dataComponentState;
+ } else if (dataComponentState instanceof StateHolder) {
+ idState.componentState = ((StateHolder) dataComponentState)
+ .saveState(faces);
+ idState.stateInHolder = true;
+ }
+ ExtendedDataModel extendedDataModel = (ExtendedDataModel) this._modelsMap
+ .get(stateKey);
+ if (null != extendedDataModel) {
+ idState.model = extendedDataModel
+ .getSerializableModel(dataComponentState
+ .getRange());
+
+ }
}
if (null != idState.model || null != idState.componentState) {
state.componentStates.put(stateKey, idState);
18 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r2278 - in trunk: framework/impl/src/main/java/org/ajax4jsf/webapp and 25 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-15 15:09:33 -0400 (Wed, 15 Aug 2007)
New Revision: 2278
Added:
trunk/samples/seamEAR/
trunk/samples/seamEAR/ear/
trunk/samples/seamEAR/ear/pom.xml
trunk/samples/seamEAR/ejbs/
trunk/samples/seamEAR/ejbs/pom.xml
trunk/samples/seamEAR/ejbs/src/
trunk/samples/seamEAR/ejbs/src/main/
trunk/samples/seamEAR/ejbs/src/main/resources/
trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/
trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml
trunk/samples/seamEAR/pom.xml
trunk/samples/seamEAR/primary-source/
trunk/samples/seamEAR/primary-source/pom.xml
trunk/samples/seamEAR/projects/
trunk/samples/seamEAR/projects/logging/
trunk/samples/seamEAR/projects/logging/pom.xml
trunk/samples/seamEAR/projects/pom.xml
trunk/samples/seamEAR/src/
trunk/samples/seamEAR/src/main/
trunk/samples/seamEAR/src/main/resources/
trunk/samples/seamEAR/wars/
trunk/samples/seamEAR/wars/pom.xml
trunk/samples/seamEAR/wars/seamWebapp/
trunk/samples/seamEAR/wars/seamWebapp/pom.xml
trunk/samples/seamEAR/wars/seamWebapp/src/
trunk/samples/seamEAR/wars/seamWebapp/src/main/
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
trunk/ui/scrollableDataTable/
trunk/ui/separator/src/main/java/META-INF/
trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF
Removed:
trunk/ui/scrollable-grid/
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/ui/pom.xml
trunk/ui/scrollableDataTable/pom.xml
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml
Log:
rename scrollable-grid int scrollableDataTable.
Add ear seam project.
Fix memory leak in IE
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2007-08-15 19:00:14 UTC (rev 2277)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2007-08-15 19:09:33 UTC (rev 2278)
@@ -390,7 +390,7 @@
}
// context.setHeader("Content-Type",getContentType());
context.setContentType(getContentType(null));
- if (getContentLength(context) > 0) {
+ if (!cached && getContentLength(context) > 0) {
context.setIntHeader("Content-Length", getContentLength(context));
} else {
// context.setHeader("Transfer-Encoding", "chunked");
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2007-08-15 19:00:14 UTC (rev 2277)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2007-08-15 19:09:33 UTC (rev 2278)
@@ -44,234 +44,238 @@
*
*/
public class CacheContent implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 8120940486890871177L;
-
- private static final Log _log = LogFactory.getLog(CacheContent.class);
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8120940486890871177L;
- // private transient ByteArrayOutputStream outputStream ;
- private transient FastBufferOutputStream outputStream;
+ private static final Log _log = LogFactory.getLog(CacheContent.class);
- private transient FastBufferWriter stringOutputWriter;
+ // private transient ByteArrayOutputStream outputStream ;
+ private transient FastBufferOutputStream outputStream;
- private transient PrintWriter servletWriter;
+ private transient FastBufferWriter stringOutputWriter;
- private transient ServletOutputStream servletStream;
+ private transient PrintWriter servletWriter;
- // content to send.
- private byte[] content = null;
+ private transient ServletOutputStream servletStream;
- private String writerContent = null;
+ // content to send.
+ private byte[] content = null;
- boolean filledOutputStream = false;
+ private String writerContent = null;
- boolean filledOutputWriter = false;
+ boolean filledOutputStream = false;
- private Map headers = new HashMap();
+ boolean filledOutputWriter = false;
- private String contentType;
+ private Map headers = new HashMap();
- /**
- * Send saved content to http responce
- *
- * @param response
- * @throws IOException
- */
- public void send(HttpServletResponse response) throws IOException {
- if (filledOutputStream) {
- OutputStream out = response.getOutputStream();
- if (content != null) {
- out.write(content);
- } else {
- this.outputStream.writeTo(out);
- }
- // out.flush();
- // out.close();
- } else if (filledOutputWriter) {
- Writer out = response.getWriter();
- if (null != writerContent) {
- out.write(writerContent);
- } else {
- stringOutputWriter.writeTo(out);
- }
- // out.flush();
- // out.close();
+ private String contentType;
+
+ /**
+ * Send saved content to http responce
+ *
+ * @param response
+ * @throws IOException
+ */
+ public void send(HttpServletResponse response) throws IOException {
+ if (filledOutputStream) {
+ OutputStream out = response.getOutputStream();
+ if (content != null) {
+ out.write(content);
+ } else {
+ this.outputStream.writeTo(out);
+ }
+ // out.flush();
+ // out.close();
+ } else if (filledOutputWriter) {
+ Writer out = response.getWriter();
+ if (null != writerContent) {
+ out.write(writerContent);
+ } else {
+ stringOutputWriter.writeTo(out);
+ }
+ // out.flush();
+ // out.close();
+ }
}
- }
- /**
- * Send saved headers to http responce.
- *
- * @param response
- */
- public void sendHeaders(HttpServletResponse response) {
- for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) {
- Map.Entry element = (Map.Entry) iter.next();
- String header = (String) element.getKey();
- Object headerValue = element.getValue();
- try {
- if (headerValue instanceof Long) {
- Long time = (Long) headerValue;
- response.setDateHeader(header, time.longValue());
- } else if (headerValue instanceof Integer) {
- Integer value = (Integer) headerValue;
- response.setIntHeader(header, value.intValue());
- } else {
- response.setHeader(header, (String) headerValue);
+ /**
+ * Send saved headers to http responce.
+ *
+ * @param response
+ */
+ public void sendHeaders(HttpServletResponse response) {
+ for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) {
+ Map.Entry element = (Map.Entry) iter.next();
+ String header = (String) element.getKey();
+ Object headerValue = element.getValue();
+ try {
+ if (headerValue instanceof Long) {
+ Long time = (Long) headerValue;
+ response.setDateHeader(header, time.longValue());
+ } else if (headerValue instanceof Integer) {
+ Integer value = (Integer) headerValue;
+ response.setIntHeader(header, value.intValue());
+ } else {
+ response.setHeader(header, (String) headerValue);
+ }
+
+ } catch (Exception e) {
+ _log.error("Error set response header " + header + "for value "
+ + headerValue, e);
+ }
+ // set real content-length.
+ // / if (null != content) {
+ if (filledOutputStream) {
+ if (null != content && content.length > 0) {
+ response.setIntHeader("Content-Length", content.length);
+ } else if (null != outputStream && outputStream.getLength() > 0) {
+ response.setIntHeader("Content-Length", outputStream
+ .getLength());
+ }
+ } // TODO - calculate content-lenght for writer ?
+ if (null != contentType) {
+ response.setContentType(this.contentType);
+ }
}
+ }
- } catch (Exception e) {
- _log.error("Error set response header "+header+"for value "+headerValue, e);
- }
- // set real content-length.
- // / if (null != content) {
- if (filledOutputStream) {
- // / response.setIntHeader("Content-Length", content.length);
- response.setIntHeader("Content-Length", outputStream
- .getLength());
- } // TODO - calculate content-lenght for writer ?
- if (null != contentType) {
- response.setContentType(this.contentType);
- }
+ public void setDateHeader(String name, long value) {
+ // Expires not stored in cache - must be re-calculated for every
+ // response.
+ if (!"Expires".equals(name)) {
+ headers.put(name, new Long(value));
+ }
}
- }
- public void setDateHeader(String name, long value) {
- // Expires not stored in cache - must be re-calculated for every
- // response.
- if (!"Expires".equals(name)) {
- headers.put(name, new Long(value));
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String,
+ * java.lang.String)
+ */
+ public void setHeader(String name, String value) {
+ headers.put(name, value);
}
- }
- /*
- * (non-Javadoc)
- *
- * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String,
- * java.lang.String)
- */
- public void setHeader(String name, String value) {
- headers.put(name, value);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String,
+ * int)
+ */
+ public void setIntHeader(String name, int value) {
+ headers.put(name, new Integer(value));
+ }
- /*
- * (non-Javadoc)
- *
- * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String,
- * int)
- */
- public void setIntHeader(String name, int value) {
- headers.put(name, new Integer(value));
- }
+ /**
+ * Create UNIX command 'tee' like stream - send all data to servlet
+ *
+ * @param responseStream
+ * @return
+ */
+ public OutputStream getOutputStream() {
+ if (null == servletStream) {
+ outputStream = new FastBufferOutputStream(1024);
+ servletStream = new ServletOutputStream() {
- /**
- * Create UNIX command 'tee' like stream - send all data to servlet
- *
- * @param responseStream
- * @return
- */
- public OutputStream getOutputStream() {
- if (null == servletStream) {
- outputStream = new FastBufferOutputStream(1024);
- servletStream = new ServletOutputStream() {
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.io.OutputStream#close()
+ */
+ public void close() throws IOException {
+ filledOutputStream = true;
+ // / content = outputStream.toByteArray();
+ content = null;
+ }
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#close()
- */
- public void close() throws IOException {
- filledOutputStream = true;
- // / content = outputStream.toByteArray();
- content = null;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.io.OutputStream#flush()
+ */
+ public void flush() throws IOException {
+ }
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#flush()
- */
- public void flush() throws IOException {
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.io.OutputStream#write(byte[], int, int)
+ */
+ public void write(byte[] b, int off, int len)
+ throws IOException {
+ outputStream.write(b, off, len);
+ }
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#write(byte[], int, int)
- */
- public void write(byte[] b, int off, int len)
- throws IOException {
- outputStream.write(b, off, len);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.io.OutputStream#write(byte[])
+ */
+ public void write(byte[] b) throws IOException {
+ outputStream.write(b);
+ }
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#write(byte[])
- */
- public void write(byte[] b) throws IOException {
- outputStream.write(b);
- }
+ public void write(int b) throws IOException {
+ outputStream.write(b);
+ }
- public void write(int b) throws IOException {
- outputStream.write(b);
+ };
}
-
- };
+ return servletStream;
}
- return servletStream;
- }
- public PrintWriter getWriter() {
- if (null == servletWriter) {
- stringOutputWriter = new FastBufferWriter(1024);
- Writer out = new Writer() {
+ public PrintWriter getWriter() {
+ if (null == servletWriter) {
+ stringOutputWriter = new FastBufferWriter(1024);
+ Writer out = new Writer() {
- public void write(char[] cbuf, int off, int len)
- throws IOException {
- stringOutputWriter.write(cbuf, off, len);
- }
+ public void write(char[] cbuf, int off, int len)
+ throws IOException {
+ stringOutputWriter.write(cbuf, off, len);
+ }
- public void flush() throws IOException {
- }
+ public void flush() throws IOException {
+ }
- public void close() throws IOException {
- // / writerContent = stringOutputWriter.toString();
- filledOutputWriter = true;
- writerContent = null;
+ public void close() throws IOException {
+ // / writerContent = stringOutputWriter.toString();
+ filledOutputWriter = true;
+ writerContent = null;
+ }
+
+ };
+ servletWriter = new PrintWriter(out);
}
-
- };
- servletWriter = new PrintWriter(out);
+ return servletWriter;
}
- return servletWriter;
- }
- public void setContentType(String contentType) {
- this.contentType = contentType;
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
- }
+ }
- /**
- * @return Returns the contentType.
- */
- public String getContentType() {
- return contentType;
- }
+ /**
+ * @return Returns the contentType.
+ */
+ public String getContentType() {
+ return contentType;
+ }
- private void writeObject(java.io.ObjectOutputStream s) throws IOException {
- if (filledOutputStream) {
- if (outputStream != null) {
- content = outputStream.toByteArray();
- }
- } else if (filledOutputWriter) {
- if (stringOutputWriter != null) {
- char[] cs = stringOutputWriter.toCharArray();
- writerContent = new String(cs);
- }
+ private void writeObject(java.io.ObjectOutputStream s) throws IOException {
+ if (filledOutputStream) {
+ if (outputStream != null) {
+ content = outputStream.toByteArray();
+ }
+ } else if (filledOutputWriter) {
+ if (stringOutputWriter != null) {
+ char[] cs = stringOutputWriter.toCharArray();
+ writerContent = new String(cs);
+ }
+ }
+ s.defaultWriteObject();
}
- s.defaultWriteObject();
- }
}
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 19:00:14 UTC (rev 2277)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 19:09:33 UTC (rev 2278)
@@ -707,7 +707,7 @@
A4J.AJAX.replaceViewState(inputs,newinputs);
}
- if (typeof Event != "undefined") {
+ if (typeof Event.unloadElementsCache === "function") {
Event.unloadElementsCache();
}
Added: trunk/samples/seamEAR/ear/pom.xml
===================================================================
--- trunk/samples/seamEAR/ear/pom.xml (rev 0)
+++ trunk/samples/seamEAR/ear/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<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.samples.seamEAR</groupId>
+ <artifactId>ear</artifactId>
+ <packaging>ear</packaging>
+ <version>3.1.0-SNAPSHOT</version>
+ <name>ear assembly</name>
+ <parent>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamEAR</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR.wars</groupId>
+ <artifactId>seamWebapp</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-seam-core</artifactId>
+ <version>2.0.0.BETA</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-seam-core</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/jboss-seam.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <modules>
+ <jarModule>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-seam-core</artifactId>
+ <includeInApplicationXml>
+ true
+ </includeInApplicationXml>
+ </jarModule>
+ </modules>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ <version>5</version>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: trunk/samples/seamEAR/ear/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/ejbs/pom.xml
===================================================================
--- trunk/samples/seamEAR/ejbs/pom.xml (rev 0)
+++ trunk/samples/seamEAR/ejbs/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,38 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+ <version>3.1.0-SNAPSHOT</version>
+ <name>enterprise java beans</name>
+ <parent>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamEAR</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: trunk/samples/seamEAR/ejbs/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml
===================================================================
Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/pom.xml
===================================================================
--- trunk/samples/seamEAR/pom.xml (rev 0)
+++ trunk/samples/seamEAR/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,71 @@
+<project>
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ <artifactId>seamEAR</artifactId>
+ <packaging>pom</packaging>
+ <name>seam EAR project</name>
+ <modules>
+ <module>projects</module>
+ <module>primary-source</module>
+ <module>wars</module>
+ <module>ejbs</module>
+ <module>ear</module>
+ </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <unzipCommand>
+ /usr/bin/unzip -o > err.txt
+ </unzipCommand>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>
+ org.richfaces.samples.seamEAR.projects
+ </groupId>
+ <artifactId>logging</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>primary-source</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR.wars</groupId>
+ <artifactId>seamWebapp</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>ejbs</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Property changes on: trunk/samples/seamEAR/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/primary-source/pom.xml
===================================================================
--- trunk/samples/seamEAR/primary-source/pom.xml (rev 0)
+++ trunk/samples/seamEAR/primary-source/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,36 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>primary-source</artifactId>
+ <packaging>jar</packaging>
+ <name>core project classes</name>
+ <parent>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamEAR</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: trunk/samples/seamEAR/primary-source/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/projects/logging/pom.xml
===================================================================
--- trunk/samples/seamEAR/projects/logging/pom.xml (rev 0)
+++ trunk/samples/seamEAR/projects/logging/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,12 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.seamEAR.projects</groupId>
+ <artifactId>logging</artifactId>
+ <packaging>jar</packaging>
+ <name>logging</name>
+ <parent>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>projects</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+</project>
Property changes on: trunk/samples/seamEAR/projects/logging/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/projects/pom.xml
===================================================================
--- trunk/samples/seamEAR/projects/pom.xml (rev 0)
+++ trunk/samples/seamEAR/projects/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ <artifactId>projects</artifactId>
+ <packaging>pom</packaging>
+ <name>sub projects</name>
+ <parent>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamEAR</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modules>
+ <module>logging</module>
+ </modules>
+</project>
Property changes on: trunk/samples/seamEAR/projects/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/pom.xml (rev 0)
+++ trunk/samples/seamEAR/wars/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>wars</artifactId>
+ <packaging>pom</packaging>
+ <name>wars</name>
+ <version>3.1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>seamEAR</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modules>
+ <module>seamWebapp</module>
+ </modules>
+</project>
+
Property changes on: trunk/samples/seamEAR/wars/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/pom.xml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<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.samples.seamEAR.wars</groupId>
+ <artifactId>seamWebapp</artifactId>
+ <packaging>war</packaging>
+ <name>seam web client</name>
+ <parent>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>wars</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${seamHome}</directory>
+ <!-- override the destination directory for this resource -->
+ <targetPath>WEB-INF/lib</targetPath>
+ <includes>
+ <include>jboss-seam-ui.jar</include>
+ <include>jboss-seam-debug.jar</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.seamEAR</groupId>
+ <artifactId>primary-source</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>seam-core</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/jboss-seam.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>seam-ui</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/jboss-seam-ui.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/lib/jboss-el.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>seam-debug</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/jboss-seam-debug.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>seam-ioc</artifactId>
+ <version>2.0.0.BETA</version>
+ <systemPath>${seamHome}/jboss-seam-ioc.jar</systemPath>
+ <scope>system</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ </dependencies>
+</project>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS ENTITY="JSFProcess"/>
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:persistence="http://jboss.com/products/seam/persistence"
+ xmlns:drools="http://jboss.com/products/seam/drools"
+ xmlns:bpm="http://jboss.com/products/seam/bpm"
+ xmlns:security="http://jboss.com/products/seam/security"
+ xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+
+ <core:init debug="@debug@" jndi-pattern="seamIntegration/#{ejbName}/local"/>
+
+ <core:manager concurrent-request-timeout="500"
+ conversation-timeout="120000"
+ conversation-id-parameter="cid"/>
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true"
+ entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/>
+
+ <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory"
+ persistence-unit-name="seamIntegration"/>
+
+ <drools:rule-base name="securityRules">
+ <drools:rule-files><value>/security.drl</value></drools:rule-files>
+ </drools:rule-base>
+
+ <security:identity authenticate-method="#{authenticator.authenticate}"
+ security-rules="#{securityRules}"
+ remember-me="true"/>
+
+ <event type="org.jboss.seam.notLoggedIn">
+ <action expression="#{redirect.captureCurrentView}"/>
+ </event>
+ <event type="org.jboss.seam.postAuthenticate">
+ <action expression="#{redirect.returnToCapturedView}"/>
+ </event>
+
+ <mail:mail-session host="localhost" port="2525" username="test" password="test" />
+
+ <!-- For use with jBPM pageflow or process management -->
+ <!--
+ <bpm:jbpm>
+ <bpm:process-definitions></bpm:process-definitions>
+ <bpm:pageflow-definitions></bpm:pageflow-definitions>
+ </bpm:jbpm>
+ -->
+
+</components>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config version="1.2"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+ <application>
+ <message-bundle>messages</message-bundle>
+ <locale-config>
+ <default-locale>en</default-locale>
+ </locale-config>
+ <!-- Disabled when using Ajax4JSF -->
+ <!--
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ -->
+ </application>
+
+</faces-config>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,12 @@
+ <!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
+<jboss-web>
+ <class-loading java2ClassLoadingCompliance="false">
+ <loader-repository>
+ seam.jboss.org:loader=seamIntegration
+ <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+ </class-loading>
+</jboss-web>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pages xmlns="http://jboss.com/products/seam/pages"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+
+ no-conversation-view-id="/home.xhtml"
+ login-view-id="/login.xhtml">
+
+ <page view-id="*">
+ <navigation>
+ <rule if-outcome="home">
+ <redirect view-id="/home.xhtml"/>
+ </rule>
+ </navigation>
+ </page>
+
+ <exception class="org.jboss.seam.framework.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message>Not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message>Not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.OptimisticLockException">
+ <end-conversation/>
+ <redirect view-id="/error.xhtml">
+ <message>Another user changed the same data, please try again</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.AuthorizationException">
+ <redirect>
+ <message>You don't have permission to do this</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.NotLoggedInException">
+ <redirect view-id="/login.xhtml">
+ <message>Please log in first</message>
+ </redirect>
+ </exception>
+
+ <exception>
+ <redirect view-id="/error.xhtml">
+ <message>Unexpected error, please try again</message>
+ </redirect>
+ </exception>
+
+</pages>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml
===================================================================
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2007-08-15 19:00:14 UTC (rev 2277)
+++ trunk/ui/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -86,7 +86,7 @@
<module>calendar</module>
<module>treeModel</module>
<module>message</module>
- <!--module>scrollable-grid</module-->
+ <module>scrollableDataTable</module>
<module>insert</module>
</modules>
<dependencies>
Copied: trunk/ui/scrollableDataTable (from rev 2276, trunk/ui/scrollable-grid)
Modified: trunk/ui/scrollableDataTable/pom.xml
===================================================================
--- trunk/ui/scrollable-grid/pom.xml 2007-08-15 17:09:03 UTC (rev 2276)
+++ trunk/ui/scrollableDataTable/pom.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -27,7 +27,7 @@
<library>
<prefix>org.richfaces</prefix>
<taglib>
- <shortName>scrollable-grid</shortName>
+ <shortName>scrollableDataTable</shortName>
</taglib>
</library>
</configuration>
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml
===================================================================
--- trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-08-15 17:09:03 UTC (rev 2276)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml 2007-08-15 19:09:33 UTC (rev 2278)
@@ -15,7 +15,7 @@
</test>
-->
<description>
- <![CDATA[ Scrollable Grid ]]>
+ <![CDATA[ Scrollable Data Table ]]>
</description>
<renderer generate="true" override="true">
@@ -23,7 +23,7 @@
<template>org/richfaces/scrollable-grid.jspx</template>
</renderer>
<tag>
- <name>scrollable-grid</name>
+ <name>scrollableDataTable</name>
<classname>org.richfaces.taglib.ScrollableGridTag</classname>
<superclass>
org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
Added: trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF 2007-08-15 19:09:33 UTC (rev 2278)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
18 years, 8 months
- 1
- 0