JBoss Rich Faces SVN: r3168 - trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: sergeyhalipov
Date: 2007-09-28 15:31:28 -0400 (Fri, 28 Sep 2007)
New Revision: 3168
Modified:
   trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js
Log:
http://jira.jboss.com/jira/browse/RF-911
Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js
===================================================================
--- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js	2007-09-28 16:34:32 UTC (rev 3167)
+++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js	2007-09-28 19:31:28 UTC (rev 3168)
@@ -17,6 +17,11 @@
         this.eventMouseDown = this.initDrag.bindAsEventListener(this);
 
 		Event.observe(this.id, "mousedown", this.eventMouseDown);
+		
+		this.form = this.id;
+		while (this.form && !/^form$/i.test(this.form.tagName)) {
+			this.form = this.form.parentNode;
+		}
 	},
 
 	getDnDDragParams: function() {
@@ -43,6 +48,10 @@
 		this.setIndicator(event);
 
 		//this.dragEnter(event);
+		
+		if (this.form) {
+			drag.params[this.form.id] = this.form.id;
+		}
 	},
 
 	getContentType: function() {
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3167 - in trunk: ui/scrollableDataTable/src/main/java/org/richfaces/event/sort and 2 other directories.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: maksimkaszynski
Date: 2007-09-28 12:34:32 -0400 (Fri, 28 Sep 2007)
New Revision: 3167
Added:
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/AbstractSortListener.java
Modified:
   trunk/framework/api/src/main/java/org/richfaces/event/sort/SortEvent.java
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
Log:
http://jira.jboss.com/jira/browse/RF-1037
Modified: trunk/framework/api/src/main/java/org/richfaces/event/sort/SortEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/sort/SortEvent.java	2007-09-28 16:20:16 UTC (rev 3166)
+++ trunk/framework/api/src/main/java/org/richfaces/event/sort/SortEvent.java	2007-09-28 16:34:32 UTC (rev 3167)
@@ -13,7 +13,6 @@
 import javax.faces.component.UIComponent;
 import javax.faces.event.FacesListener;
 
-import org.richfaces.event.AttributedEvent;
 import org.richfaces.event.ScrollableGridViewEvent;
 
 /**
@@ -27,6 +26,8 @@
 	
 	private int sortColumn;
 	
+	private Boolean suggestedOrder = null;
+	
 	public SortEvent(UIComponent component, int sortColumn, int rows, int first) {
 		
 		super(component, rows, first);
@@ -59,4 +60,12 @@
 	public void setSortColumn(int sortColumn) {
 		this.sortColumn = sortColumn;
 	}
+
+	public Boolean getSuggestedOrder() {
+		return suggestedOrder;
+	}
+
+	public void setProposedOrder(Boolean proposedOrder) {
+		this.suggestedOrder = proposedOrder;
+	}
 }
Added: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/AbstractSortListener.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/AbstractSortListener.java	                        (rev 0)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/AbstractSortListener.java	2007-09-28 16:34:32 UTC (rev 3167)
@@ -0,0 +1,46 @@
+/**
+ * License Agreement.
+ *
+ *  JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007  Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ */
+
+package org.richfaces.event.sort;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public abstract class AbstractSortListener implements SortListener {
+	
+	/**
+	 * Encapsulate sorting toggle here
+	 * @param current
+	 * @param suggested
+	 * @return
+	 */
+	protected Boolean nextSortOrder(Boolean current, Boolean suggested) {
+		
+		if (suggested != null) {
+			return suggested;
+		} else {
+			return (current == null) ? Boolean.TRUE : (current.booleanValue() ? Boolean.FALSE : Boolean.TRUE);
+		}
+		
+	}
+
+}
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java	2007-09-28 16:20:16 UTC (rev 3166)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java	2007-09-28 16:34:32 UTC (rev 3167)
@@ -21,7 +21,7 @@
  * @author Maksim Kaszynski
  *
  */
-public class MultiColumnSortListener implements SortListener {
+public class MultiColumnSortListener extends AbstractSortListener {
 
 	public static final MultiColumnSortListener INSTANCE = new MultiColumnSortListener();
 	
@@ -51,11 +51,13 @@
 			
 		}
 		
+		Boolean suggested = e.getSuggestedOrder();
+		
 		SortField[] fields = sortOrder.getFields();
 		
 		if (fields == null) {
 			//If no sorting was applied at all, set sorting to current
-			fields = new SortField[] {new SortField(name, columnIndex, Boolean.TRUE)};
+			fields = new SortField[] {new SortField(name, columnIndex, nextSortOrder(null, suggested))};
 		} else {
 			
 			List newFields = new LinkedList(Arrays.asList(fields));
@@ -69,16 +71,16 @@
 								name.equals(sortField.getName()))) {
 					
 					Boolean asc = sortField.getAscending();
-					asc = Boolean.TRUE.equals(asc) ? Boolean.FALSE : Boolean.TRUE;
 					
-					newField = new SortField(name, columnIndex, asc);
+					newField = new SortField(name, columnIndex, nextSortOrder(asc, suggested));
 					iterator.remove();
 					
 				}				
 			}
 			
 			if (newField == null) {
-				newField = new SortField(name, columnIndex, Boolean.TRUE);
+				
+				newField = new SortField(name, columnIndex, nextSortOrder(null, suggested));
 			}
 			
 			newFields.add(newField);
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java	2007-09-28 16:20:16 UTC (rev 3166)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java	2007-09-28 16:34:32 UTC (rev 3167)
@@ -15,7 +15,7 @@
  * @author Maksim Kaszynski
  *
  */
-public class SingleColumnSortListener implements SortListener {
+public class SingleColumnSortListener extends AbstractSortListener {
 
 	public static final SingleColumnSortListener INSTANCE = new SingleColumnSortListener();
 	
@@ -46,7 +46,7 @@
 		
 		SortField[] fields = sortOrder.getFields();
 		
-		SortField newField = new SortField(name, columnIndex, Boolean.TRUE);
+		SortField newField = new SortField(name, columnIndex, nextSortOrder(null, e.getSuggestedOrder()));
 		
 		if (fields != null) {
 			for (int i = 0; i < fields.length; i++) {
@@ -56,8 +56,7 @@
 								name != null && 
 								name.equals(sortField.getName()))) {
 					
-					Boolean asc = sortField.getAscending();
-					asc = Boolean.TRUE.equals(asc) ? Boolean.FALSE : Boolean.TRUE;
+					Boolean asc = nextSortOrder(sortField.getAscending(), e.getSuggestedOrder()) ;
 					
 					newField = new SortField(name, columnIndex, asc);
 					break;
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java	2007-09-28 16:20:16 UTC (rev 3166)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java	2007-09-28 16:34:32 UTC (rev 3167)
@@ -582,13 +582,28 @@
 			
 			if(parameters.containsKey(clientId + ":sortColumn") &&
 			   parameters.containsKey(clientId + ":sortStartRow") && 
-			   parameters.containsKey(clientId + ":sortIndex") && 
-			   parameters.containsKey(clientId + ":sortOrder")){ 
+			   parameters.containsKey(clientId + ":sortIndex")){ 
 				
 				int sortColumn = Integer.parseInt((String)parameters.get(clientId + ":sortColumn"));
 				int sortDataIndex = Integer.parseInt((String)parameters.get(clientId + ":sortIndex"));
 				Integer sortStartRow = Integer.valueOf((String)parameters.get(clientId + ":sortStartRow"));
 				
+				String sortOrderString = 
+					(String) parameters.get(clientId + ":sortOrder");
+				
+				Boolean so = null;
+				
+				if (sortOrderString != null && sortOrderString.length() > 0 ) {
+					sortOrderString = sortOrderString.toLowerCase();
+					
+					if (sortOrderString.startsWith("a")) {
+						so = Boolean.TRUE;
+					} else if (sortOrderString.startsWith("d")){
+						so = Boolean.FALSE;
+					}
+				}
+				
+				
 				Column column = (Column)grid.getChildren().get(sortColumn);
 				
 				if(column.isSortable()){
@@ -596,6 +611,8 @@
 					sorted = true;
 					SortEvent sortEvent = new SortEvent(grid,sortColumn, grid.getRows(), sortDataIndex);
 					
+					sortEvent.setProposedOrder(so);
+					
 					sortEvent.setAttribute(ScrollableDataTableUtils.CLIENT_ROW_KEY,sortStartRow);
 					
 					if (ajaxContext.isAjaxRequest()) {
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-09-28 16:20:16 UTC (rev 3166)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js	2007-09-28 16:34:32 UTC (rev 3167)
@@ -195,7 +195,7 @@
 				frozen: false,
 				fixedWidth: Validators.getBoolean(cell.getAttribute("fixedWidth"), false),
 				sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
-				sorted: Validators.getBoolean(cell.getAttribute("sorted"), "desc")
+				sorted: null
 			};
 			
 			if(columns[j].sortable)
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3166 - trunk/docs/userguide/en/src/main/docbook/included.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: vkorluzhenko
Date: 2007-09-28 12:20:16 -0400 (Fri, 28 Sep 2007)
New Revision: 3166
Modified:
   trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
   trunk/docs/userguide/en/src/main/docbook/included/message.xml
   trunk/docs/userguide/en/src/main/docbook/included/messages.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - corrected descriptions
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml	2007-09-28 14:55:01 UTC (rev 3165)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml	2007-09-28 16:20:16 UTC (rev 3166)
@@ -83,14 +83,15 @@
                 <listitem><para>Add to your style sheets style classes used by a menu separator</para></listitem>
             </itemizedlist>
         </section>
-        <section>
-            <title>Redefinition of Skin Parameters</title>
+        
+    <section>
+        <title>Skin parameters redefinition</title>
             <table>
-                <title>Label skin parameters redefinition</title> 
+                <title>Skin parameters redefinition for an item</title> 
                 <tgroup cols="2">
                     <thead>
                         <row>
-                            <entry>Skin parameters for item</entry> 
+                            <entry>Skin parameters</entry> 
                             <entry>CSS properties</entry> 
                         </row>
                     </thead>
@@ -105,9 +106,9 @@
         </section>
     <section>
         <title>Definition of Custom Style Classes</title>
-        <para>
-            In the screenshot, there are the classes names that define separator element appearance.
-        </para>
+        
+        <para>On the screenshot there are classes names that define styles for component elements.</para>
+        
         <figure>
             <title>Classes names</title> 
             <mediaobject>
@@ -127,8 +128,8 @@
                 </thead>
                 <tbody>
                     <row>
-                        <entry>Rich-menu-item</entry> 
-                        <entry>Defines the class for div element for separator</entry> 
+                        <entry>rich-menu-separator</entry> 
+                        <entry>Defines styles for a wrapper <div> element for a separator</entry> 
                     </row>
                 </tbody>
             </tgroup>
Modified: trunk/docs/userguide/en/src/main/docbook/included/message.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/message.xml	2007-09-28 14:55:01 UTC (rev 3165)
+++ trunk/docs/userguide/en/src/main/docbook/included/message.xml	2007-09-28 16:20:16 UTC (rev 3166)
@@ -135,6 +135,8 @@
 
   <section>
     <title>Definition of Custom Style Classes</title>
+    
+    <para>On the screenshot there are classes names that define styles for component elements.</para>
 
     <figure>
       <title>Classes names</title>
@@ -146,10 +148,8 @@
       </mediaobject>
     </figure>
 
-    <para>On the screenshot, there are classes names defining specified elements.</para>
-
     <table>
-      <title>Component skin class</title>
+      <title>Classes names that define a component appearance</title>
 
       <tgroup cols="2">
         <thead>
@@ -164,19 +164,19 @@
           <row>
             <entry>rich-message</entry>
 
-            <entry>Defines the class for wrapper element</entry>
+            <entry>Defines styles for a wrapper element</entry>
           </row>
 
           <row>
             <entry>rich-message-marker</entry>
 
-            <entry>Defines the class for marker element</entry>
+            <entry>Defines styles for a marker</entry>
           </row>
 
           <row>
             <entry>rich-message-label</entry>
 
-            <entry>Defines the class for label element</entry>
+            <entry>Defines styles for a label</entry>
           </row>
 
         </tbody>
Modified: trunk/docs/userguide/en/src/main/docbook/included/messages.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/messages.xml	2007-09-28 14:55:01 UTC (rev 3165)
+++ trunk/docs/userguide/en/src/main/docbook/included/messages.xml	2007-09-28 16:20:16 UTC (rev 3166)
@@ -130,62 +130,50 @@
 
   <section>
     <title>Definition of Custom Style Classes</title>
-
+    
+    <para>On the screenshot there are classes names that define styles for component elements.</para>
+    
     <figure>
       <title>Classes names</title>
-
+      
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/messages1.png"/>
+          <imagedata fileref="images/message1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
-
-    <para>On the screenshot, there are classes names defining specified elements.</para>
-
+    
     <table>
-      <title>Component skin class</title>
-
+      <title>Classes names that define a component appearance</title>
+      
       <tgroup cols="2">
         <thead>
           <row>
             <entry>Class name</entry>
-
+            
             <entry>Description</entry>
           </row>
         </thead>
-
+        
         <tbody>
           <row>
-            <entry>rich-messages</entry>
-
-            <entry>Defines styles for outer element</entry>
+            <entry>rich-message</entry>
+            
+            <entry>Defines styles for a wrapper element</entry>
           </row>
-
-          <row>
-            <entry>rich-messages-marker</entry>
-
-            <entry>Defines styles for icon element</entry>
-          </row>
-
-          <row>
-            <entry>rich-messages-label</entry>
-
-            <entry>Defines styles for informational label element</entry>
-          </row>
           
-          <!--row>
-            <entry>rich-messages-header</entry>
+          <row>
+            <entry>rich-message-marker</entry>
             
-            <entry>Defines styles for header element</entry>
+            <entry>Defines styles for a marker</entry>
           </row>
           
           <row>
-            <entry>rich-passed</entry>
+            <entry>rich-message-label</entry>
             
-            <entry>Defines styles for all messages elements (marker, label, header)</entry>
-          </row-->
-
+            <entry>Defines styles for a label</entry>
+          </row>
+          
         </tbody>
       </tgroup>
     </table>
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3165 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: maksimkaszynski
Date: 2007-09-28 10:55:01 -0400 (Fri, 28 Sep 2007)
New Revision: 3165
Modified:
   trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
http://jira.jboss.com/jira/browse/RF-975
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js	2007-09-28 12:25:33 UTC (rev 3164)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js	2007-09-28 14:55:01 UTC (rev 3165)
@@ -938,12 +938,35 @@
 }
 
 Richfaces.showModalPanel = function (id, opts) {
+	
+	var invoke = 
+		("MSIE" == RichFaces.navigatorType()) ?
+		function(f) {
+				if (document.readyState != "complete") {
+					var args = arguments;
+					var dis = this;
+				window.setTimeout(
+					function() {
+						args.callee.apply(dis,args );
+					}, 50);
+			} else {
+				f();
+			}
+		} : 
+		function(f) {
+			f();
+		}; 
+	
 	var panel = $(id);
 	if (!panel) {
 		panel = Richfaces.findModalPanel(id);
 	}
-	panel.modalPanel.show(opts);
-}
+	invoke(function() {
+		panel.modalPanel.show(opts);
+	});
+	
+	
+};
 
 Richfaces.hideModalPanel = function (id, opts) {
 	var panel = $(id);
@@ -951,4 +974,4 @@
 		panel = Richfaces.findModalPanel(id);
 	}
 	panel.modalPanel.hide(opts);
-}
+};
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3164 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: dmorozov
Date: 2007-09-28 08:25:33 -0400 (Fri, 28 Sep 2007)
New Revision: 3164
Modified:
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
Log:
Fix behavior of quick find. Add ignoring of tabs while look for cell's text
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js	2007-09-28 11:40:53 UTC (rev 3163)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js	2007-09-28 12:25:33 UTC (rev 3164)
@@ -180,14 +180,13 @@
 	quickFind: function(column, text, startRow) {
 		var start = startRow || 0;
 	    var searchText = ".*" + text + ".*";
-	    //searchText = searchText.replace(/\*/g, ".*");
 	    var searchReg = new RegExp(searchText, 'i');
 		var rowIndex = -1;
 		var body = this.getBody();
 		var rowsCount = body.rowsCount;
         for (var i = start; i < rowsCount; i++) {
             var currentTextInGrid = body.getCellText(i, column);
-            currentTextInGrid = currentTextInGrid.replace(/,/g,'');
+            currentTextInGrid = currentTextInGrid.replace(/(<[^<]*>)/g,'');
             if (currentTextInGrid.search(searchReg) != -1) {
                 rowIndex = i;
                 break;
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3163 - in trunk: samples/calendar-sample/src/main/java/org/richfaces and 6 other directories.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: maksimkaszynski
Date: 2007-09-28 07:40:53 -0400 (Fri, 28 Sep 2007)
New Revision: 3163
Modified:
   trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java
   trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java
   trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
   trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
   trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
   trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
   trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java
Log:
fixed build
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -3,10 +3,7 @@
  */
 package org.ajax4jsf.event;
 
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.Queue;
 
 import javax.faces.event.FacesEvent;
 
@@ -21,6 +18,8 @@
 	
 	private QueueElement last;
 
+	private int size = 0;
+	
 	/**
 	 * Remove and return first queued event.
 	 * @return faces event form top of queue
@@ -31,10 +30,11 @@
 			throw new NoSuchElementException("Events queue is empty");
 		}
 		FacesEvent element = first.getElement();
-		first = first.getPrevisious();
+		first = first.getPrevious();
 		if(null == first){
 			last = null;
 		}
+		size--;
 		return element;
 	}
 
@@ -47,22 +47,28 @@
 		if(isEmpty()){
 			first = last = queueElement;
 		} else {
-			last.setPrevisious(queueElement);
+			last.setPrevious(queueElement);
 			last = queueElement;
 		}
+		size++;
 	}
 
 	public void clear() {
+		size = 0;
 		first = last = null;
 	}
 
 	public boolean isEmpty() {		
 		return null == first;
 	}
+	
+	public int size() {
+		return size;
+	}
 
 	private static class QueueElement {
 		
-		private QueueElement previsious;
+		private QueueElement previous;
 		
 		private FacesEvent element;
 
@@ -72,18 +78,18 @@
 
 		
 		/**
-		 * @param previsious the previsious to set
+		 * @param previous the previous to set
 		 */
-		public void setPrevisious(QueueElement previsious) {
-			this.previsious = previsious;
+		public void setPrevious(QueueElement previsious) {
+			this.previous = previsious;
 		}
 
 
 		/**
-		 * @return the previsious
+		 * @return the previous
 		 */
-		public QueueElement getPrevisious() {
-			return previsious;
+		public QueueElement getPrevious() {
+			return previous;
 		}
 
 		/**
Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Random;
 
 import org.richfaces.model.CalendarDataModel;
 import org.richfaces.model.CalendarDataModelItem;
@@ -62,8 +63,18 @@
 		data.put("enLabel", enFormatter.format(date));
 		data.put("frLabel", frFormatter.format(date));
 		data.put("deLabel", deFormatter.format(date));
+		
+		
+		if (new Random().nextInt(10) > 5) {
+			item.setEnabled(true);
+		} else {
+			item.setEnabled(false);
+		}
+		
 		item.setData(data);
-				
+		
+		System.out.println(item.getData() + " " + item.isEnabled());
+		
 		return item;
 	}
 
Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -33,6 +33,7 @@
 import javax.faces.event.PhaseId;
 import javax.servlet.http.HttpServletResponse;
 
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.resource.InternetResource;
 import org.ajax4jsf.resource.InternetResourceBuilder;
 import org.ajax4jsf.resource.ResourceBuilderImpl;
@@ -319,7 +320,7 @@
         menuItem.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
         assertEquals(1, events.size());
@@ -338,7 +339,7 @@
         menuItem.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
         assertEquals(1, events.size());
Modified: trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -31,9 +31,9 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
 import org.apache.commons.lang.StringUtils;
 import org.richfaces.component.html.HtmlPanelBar;
 import org.richfaces.component.html.HtmlPanelBarItem;
@@ -255,12 +255,12 @@
         panelBar.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
         assertEquals(1, events.size());
 
-        FacesEvent event = (FacesEvent) events.iterator().next();
+        FacesEvent event = (FacesEvent) events.remove();
         assertTrue(event instanceof SwitchablePanelSwitchEvent);
         SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
         assertEquals(switchEvent.getValue(), "Swich");
@@ -275,7 +275,7 @@
         panelBar.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
         assertEquals(0, events.size());
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -41,18 +41,18 @@
 
 public abstract class ScrollableDataTableBaseRenderer extends CompositeRenderer {
 	
-	public final String PARTIAL_UPDATE= "partialUpdate";
-	public final String UPDATE_HEADER = "updateHeader";
+	public static final String PARTIAL_UPDATE = "partialUpdate";
+	public static final String UPDATE_HEADER = "updateHeader";
 	
-	public final String  FOOTER_PART = "footer";
+	public static final String  FOOTER_PART = "footer";
 	
-	public final String  HEADER_PART = "header";
+	public static final String  HEADER_PART = "header";
 	
-	private final String COLUMN_FROZEN_TYPE = "frozen"; 
+	private static final String COLUMN_FROZEN_TYPE = "frozen"; 
 	
-	private final String COLUMN_NORMAL_TYPE = "normal";
+	private static final String COLUMN_NORMAL_TYPE = "normal";
 	
-	private final String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported";
+	private static final String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported";
 	
 	private RendererBase cellTemplate = null;
 	
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js	2007-09-28 11:40:53 UTC (rev 3163)
@@ -179,8 +179,8 @@
 	},
 	quickFind: function(column, text, startRow) {
 		var start = startRow || 0;
-	    var searchText = "*" + text + "*";
-	    searchText = searchText.replace(/\*/g, ".*");
+	    var searchText = ".*" + text + ".*";
+	    //searchText = searchText.replace(/\*/g, ".*");
 	    var searchReg = new RegExp(searchText, 'i');
 		var rowIndex = -1;
 		var body = this.getBody();
Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -21,14 +21,10 @@
 
 package org.richfaces.component;
 
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlScript;
-import org.richfaces.event.SwitchablePanelSwitchEvent;
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
-import org.apache.commons.lang.StringUtils;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
@@ -38,11 +34,16 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import org.ajax4jsf.event.EventsQueue;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.ajax4jsf.tests.MockViewRoot;
+import org.apache.commons.lang.StringUtils;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
 
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlScript;
+
 /**
  * Unit test for Datascroller component.
  */
@@ -331,12 +332,12 @@
         toggleControl.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
         assertEquals(2, events.size());
 
-        FacesEvent event = (FacesEvent) events.iterator().next();
+        FacesEvent event = (FacesEvent) events.remove();
         assertTrue(event instanceof SwitchablePanelSwitchEvent);
         SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
         assertEquals(switchEvent.getValue(), "ABYBC");
@@ -346,7 +347,7 @@
         assertNotNull(events);
         assertEquals(1, events.size());
 
-        event = (FacesEvent) events.iterator().next();
+        event = (FacesEvent) events.remove();
 
         assertTrue(event instanceof ActionEvent);
         ActionEvent actionEvent = (ActionEvent) event;
@@ -366,7 +367,7 @@
         togglePanel.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
         assertEquals(0, events.size());
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java	2007-09-27 23:29:10 UTC (rev 3162)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java	2007-09-28 11:40:53 UTC (rev 3163)
@@ -26,10 +26,10 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockMethodBinding;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
 import org.richfaces.component.UITree;
 import org.richfaces.component.UITreeNode;
 import org.richfaces.event.AjaxSelectedEvent;
@@ -102,7 +102,7 @@
 		MockMethodBinding binding = new MockMethodBinding();
 		treeNode.setNodeSelectListener(binding);
 		
-		Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext);
+		EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext);
 		assertNotNull(events);
 		assertEquals(0, events.size());
 
@@ -125,7 +125,7 @@
 		MockMethodBinding binding = new MockMethodBinding();
 		treeNode.setNodeSelectListener(binding);
 		
-		Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext);
+		EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext);
 		assertNotNull(events);
 		assertEquals(0, events.size());
 		assertEquals(0, binding.getInvocationArgs().length);
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3162 - in tags: 3.1.1-CR1 and 120 other directories.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: alexsmirnov
Date: 2007-09-27 19:29:10 -0400 (Thu, 27 Sep 2007)
New Revision: 3162
Added:
   tags/3.1.1-CR1/
Modified:
   tags/3.1.1-CR1/cdk/generator/pom.xml
   tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/pom.xml
   tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
   tags/3.1.1-CR1/cdk/maven-archetype-jsfwebapp/pom.xml
   tags/3.1.1-CR1/cdk/maven-cdk-plugin/pom.xml
   tags/3.1.1-CR1/cdk/pom.xml
   tags/3.1.1-CR1/docs/pom.xml
   tags/3.1.1-CR1/docs/userguide/en/pom.xml
   tags/3.1.1-CR1/docs/userguide/pom.xml
   tags/3.1.1-CR1/docs/xslt/en/pom.xml
   tags/3.1.1-CR1/docs/xslt/pom.xml
   tags/3.1.1-CR1/extensions/gwt/pom.xml
   tags/3.1.1-CR1/extensions/pom.xml
   tags/3.1.1-CR1/extensions/portlet/pom.xml
   tags/3.1.1-CR1/extensions/seam/pom.xml
   tags/3.1.1-CR1/extensions/trinidad/pom.xml
   tags/3.1.1-CR1/framework/api-parent/pom.xml
   tags/3.1.1-CR1/framework/api/pom.xml
   tags/3.1.1-CR1/framework/impl-parent/pom.xml
   tags/3.1.1-CR1/framework/impl/pom.xml
   tags/3.1.1-CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
   tags/3.1.1-CR1/framework/pom.xml
   tags/3.1.1-CR1/framework/test/pom.xml
   tags/3.1.1-CR1/pom.xml
   tags/3.1.1-CR1/samples/ajaxPortlet/pom.xml
   tags/3.1.1-CR1/samples/calendar-sample/pom.xml
   tags/3.1.1-CR1/samples/dataFilterSliderDemo/pom.xml
   tags/3.1.1-CR1/samples/dataTableDemo/pom.xml
   tags/3.1.1-CR1/samples/datascroller-sample/pom.xml
   tags/3.1.1-CR1/samples/dragDropDemo/pom.xml
   tags/3.1.1-CR1/samples/dropdownmenu-sample/pom.xml
   tags/3.1.1-CR1/samples/effect-sample/pom.xml
   tags/3.1.1-CR1/samples/gmap-sample/pom.xml
   tags/3.1.1-CR1/samples/inputNumberSliderDemo/pom.xml
   tags/3.1.1-CR1/samples/inputNumberSpinnerDemo/pom.xml
   tags/3.1.1-CR1/samples/local-value-demo/pom.xml
   tags/3.1.1-CR1/samples/modalpanel-sample/pom.xml
   tags/3.1.1-CR1/samples/panel-sample/pom.xml
   tags/3.1.1-CR1/samples/panelbar-sample/pom.xml
   tags/3.1.1-CR1/samples/panelmenu-sample/pom.xml
   tags/3.1.1-CR1/samples/pom.xml
   tags/3.1.1-CR1/samples/portal-echo/pom.xml
   tags/3.1.1-CR1/samples/rich-message-demo/pom.xml
   tags/3.1.1-CR1/samples/richfaces-art-datatable/pom.xml
   tags/3.1.1-CR1/samples/richfaces-demo/pom.xml
   tags/3.1.1-CR1/samples/richfaces-ear-demo/ejb/pom.xml
   tags/3.1.1-CR1/samples/richfaces-ear-demo/pom.xml
   tags/3.1.1-CR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml
   tags/3.1.1-CR1/samples/richfaces-ear-demo/webapp/pom.xml
   tags/3.1.1-CR1/samples/scrollableDataTableDemo/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/ear/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/ejbs/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/primary-source/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/projects/logging/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/projects/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/wars/pom.xml
   tags/3.1.1-CR1/samples/seamEAR/wars/seamWebapp/pom.xml
   tags/3.1.1-CR1/samples/seamIntegration/pom.xml
   tags/3.1.1-CR1/samples/separator-sample/pom.xml
   tags/3.1.1-CR1/samples/simpleTogglePanel-sample/pom.xml
   tags/3.1.1-CR1/samples/skins/pom.xml
   tags/3.1.1-CR1/samples/suggestionbox-sample/pom.xml
   tags/3.1.1-CR1/samples/tabPanelDemo/pom.xml
   tags/3.1.1-CR1/samples/togglePanel-sample/pom.xml
   tags/3.1.1-CR1/samples/tomahawkCompability/pom.xml
   tags/3.1.1-CR1/samples/toolBarDemo/pom.xml
   tags/3.1.1-CR1/samples/tooltip-sample/pom.xml
   tags/3.1.1-CR1/samples/tree-demo/pom.xml
   tags/3.1.1-CR1/samples/treeModelDemo/pom.xml
   tags/3.1.1-CR1/samples/useCases/pom.xml
   tags/3.1.1-CR1/samples/virtualEarth-sample/pom.xml
   tags/3.1.1-CR1/sandbox/api/pom.xml
   tags/3.1.1-CR1/sandbox/impl/pom.xml
   tags/3.1.1-CR1/sandbox/pom.xml
   tags/3.1.1-CR1/sandbox/samples/dialog-window-sample/pom.xml
   tags/3.1.1-CR1/sandbox/samples/panel2-sample/pom.xml
   tags/3.1.1-CR1/sandbox/samples/pom.xml
   tags/3.1.1-CR1/sandbox/samples/rich-message-demo/pom.xml
   tags/3.1.1-CR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml
   tags/3.1.1-CR1/sandbox/ui/dialog-window/pom.xml
   tags/3.1.1-CR1/sandbox/ui/panel2/pom.xml
   tags/3.1.1-CR1/sandbox/ui/pom.xml
   tags/3.1.1-CR1/sandbox/ui/simpleTogglePanel2/pom.xml
   tags/3.1.1-CR1/sandbox/ui/state/pom.xml
   tags/3.1.1-CR1/test-applications/facelets/pom.xml
   tags/3.1.1-CR1/test-applications/jsp/pom.xml
   tags/3.1.1-CR1/test-applications/pom.xml
   tags/3.1.1-CR1/ui/assembly/pom.xml
   tags/3.1.1-CR1/ui/calendar/pom.xml
   tags/3.1.1-CR1/ui/core/pom.xml
   tags/3.1.1-CR1/ui/create.bat
   tags/3.1.1-CR1/ui/create.sh
   tags/3.1.1-CR1/ui/dataFilterSlider/pom.xml
   tags/3.1.1-CR1/ui/dataTable/pom.xml
   tags/3.1.1-CR1/ui/datascroller/pom.xml
   tags/3.1.1-CR1/ui/drag-drop/pom.xml
   tags/3.1.1-CR1/ui/dropdown-menu/pom.xml
   tags/3.1.1-CR1/ui/effect/pom.xml
   tags/3.1.1-CR1/ui/gmap/pom.xml
   tags/3.1.1-CR1/ui/inputnumber-slider/pom.xml
   tags/3.1.1-CR1/ui/inputnumber-spinner/pom.xml
   tags/3.1.1-CR1/ui/insert/pom.xml
   tags/3.1.1-CR1/ui/menu-components/pom.xml
   tags/3.1.1-CR1/ui/message/pom.xml
   tags/3.1.1-CR1/ui/modal-panel/pom.xml
   tags/3.1.1-CR1/ui/paint2D/pom.xml
   tags/3.1.1-CR1/ui/panel/pom.xml
   tags/3.1.1-CR1/ui/panelbar/pom.xml
   tags/3.1.1-CR1/ui/panelmenu/pom.xml
   tags/3.1.1-CR1/ui/pom.xml
   tags/3.1.1-CR1/ui/scrollableDataTable/pom.xml
   tags/3.1.1-CR1/ui/separator/pom.xml
   tags/3.1.1-CR1/ui/simpleTogglePanel/pom.xml
   tags/3.1.1-CR1/ui/spacer/pom.xml
   tags/3.1.1-CR1/ui/suggestionbox/pom.xml
   tags/3.1.1-CR1/ui/tabPanel/pom.xml
   tags/3.1.1-CR1/ui/togglePanel/pom.xml
   tags/3.1.1-CR1/ui/toolBar/pom.xml
   tags/3.1.1-CR1/ui/tooltip/pom.xml
   tags/3.1.1-CR1/ui/tree/pom.xml
   tags/3.1.1-CR1/ui/treeModel/pom.xml
   tags/3.1.1-CR1/ui/virtualEarth/pom.xml
Log:
mark 3.1.1 candidate release 1
Copied: tags/3.1.1-CR1 (from rev 3161, branches/3.1.x)
Modified: tags/3.1.1-CR1/cdk/generator/pom.xml
===================================================================
--- branches/3.1.x/cdk/generator/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/generator/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>cdk</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.cdk</groupId>
 	<artifactId>generator</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>Java Server Faces component generator</name>
 	<build>
 		<plugins>
Modified: tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/pom.xml
===================================================================
--- branches/3.1.x/cdk/maven-archetype-jsf-component/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,11 +2,11 @@
   <parent>
     <artifactId>cdk</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.cdk</groupId>
   <artifactId>maven-archetype-jsf-component</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1-CR1</version>
   <name>Archetype - maven-archetype-jsf-component</name>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/3.1.x/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -10,7 +10,7 @@
 			<plugin>
 				<groupId>org.richfaces.cdk</groupId>
 				<artifactId>maven-cdk-plugin</artifactId>
-				  <version>3.1.1-SNAPSHOT</version>
+				  <version>3.1.1-CR1</version>
 				<configuration>
 					<library>
 					<prefix>${groupId}</prefix>
Modified: tags/3.1.1-CR1/cdk/maven-archetype-jsfwebapp/pom.xml
===================================================================
--- branches/3.1.x/cdk/maven-archetype-jsfwebapp/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/maven-archetype-jsfwebapp/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,11 +2,11 @@
 	<parent>
 		<artifactId>cdk</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.cdk</groupId>
 	<artifactId>maven-archetype-jsfwebapp</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>Archetype for jsf webapp project</name>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/cdk/maven-cdk-plugin/pom.xml
===================================================================
--- branches/3.1.x/cdk/maven-cdk-plugin/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/maven-cdk-plugin/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>cdk</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.cdk</groupId>
 	<artifactId>maven-cdk-plugin</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/cdk/pom.xml
===================================================================
--- branches/3.1.x/cdk/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/cdk/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
 	<artifactId>cdk</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>pom</packaging>
 	<name>JSF Components Development kit</name>
 	<dependencies />
Modified: tags/3.1.1-CR1/docs/pom.xml
===================================================================
--- branches/3.1.x/docs/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/docs/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
 	<artifactId>docs</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>Project documentation</name>
 	<packaging>pom</packaging>
 	<!-- setup repositories, to build documentation separate from Java projects -->
Modified: tags/3.1.1-CR1/docs/userguide/en/pom.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/docs/userguide/en/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.richfaces.docs</groupId>
 		<artifactId>userguide</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>org.richfaces.docs.userguide</groupId>
 	<artifactId>${translation}</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>jdocbook</packaging>
 	<name>Richfaces Manual (${translation})</name>
 
Modified: tags/3.1.1-CR1/docs/userguide/pom.xml
===================================================================
--- branches/3.1.x/docs/userguide/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/docs/userguide/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>docs</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.docs</groupId>
 	<artifactId>userguide</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>User guide</name>
 	<description>RichFaces user guide</description>
 	<pluginRepositories>
Modified: tags/3.1.1-CR1/docs/xslt/en/pom.xml
===================================================================
--- branches/3.1.x/docs/xslt/en/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/docs/xslt/en/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>xslt</artifactId>
 		<groupId>org.richfaces.docs</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.docs.xslt</groupId>
 	<artifactId>en</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>jar</packaging>
 	<name>Documentation stylesheets (English translation)</name>
 	<description>
Modified: tags/3.1.1-CR1/docs/xslt/pom.xml
===================================================================
--- branches/3.1.x/docs/xslt/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/docs/xslt/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>docs</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.docs</groupId>
 	<artifactId>xslt</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>pom</packaging>
 	<name>Documentation stylesheets</name>
 	<description>Docbook documentation stylesheets</description>
Modified: tags/3.1.1-CR1/extensions/gwt/pom.xml
===================================================================
--- branches/3.1.x/extensions/gwt/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/extensions/gwt/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>master</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.richfaces</groupId>
 			<artifactId>ajax4jsf</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
Modified: tags/3.1.1-CR1/extensions/pom.xml
===================================================================
--- branches/3.1.x/extensions/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/extensions/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
   <artifactId>extensions</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
   <name>Richfaces extensions for a different environments</name>
   <packaging>pom</packaging>
   <modules>
Modified: tags/3.1.1-CR1/extensions/portlet/pom.xml
===================================================================
--- branches/3.1.x/extensions/portlet/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/extensions/portlet/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>extensions</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.extensions</groupId>
 	<artifactId>portlet</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-test</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
Modified: tags/3.1.1-CR1/extensions/seam/pom.xml
===================================================================
--- branches/3.1.x/extensions/seam/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/extensions/seam/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -35,7 +35,7 @@
 	<dependency>
 		<groupId>org.richfaces</groupId>
 		<artifactId>ajax4jsf</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</dependency>
 	<dependency>
 		<groupId>jboss</groupId>
Modified: tags/3.1.1-CR1/extensions/trinidad/pom.xml
===================================================================
--- branches/3.1.x/extensions/trinidad/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/extensions/trinidad/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -35,7 +35,7 @@
 	<dependency>
 		<groupId>org.richfaces</groupId>
 		<artifactId>ajax4jsf</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</dependency>
   	<dependency>
   	    <groupId>org.apache.myfaces.trinidad</groupId>
Modified: tags/3.1.1-CR1/framework/api/pom.xml
===================================================================
--- branches/3.1.x/framework/api/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/api/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,13 +2,13 @@
 	<parent>
 		<artifactId>framework</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.framework</groupId>
 	<artifactId>richfaces-api</artifactId>
 	<name>Java Server Faces AJAX framework API</name>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<build>
 		<plugins>
 			<plugin>
Modified: tags/3.1.1-CR1/framework/api-parent/pom.xml
===================================================================
--- branches/3.1.x/framework/api-parent/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/api-parent/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,13 +4,13 @@
 	<parent>
 		<artifactId>framework</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.framework</groupId>
 	<packaging>pom</packaging>
 	<artifactId>api-parent</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>Java Server Faces AJAX framework API Dependencies</name>
 	<properties>
 		<jsfVersion>1.1</jsfVersion>
Modified: tags/3.1.1-CR1/framework/impl/pom.xml
===================================================================
--- branches/3.1.x/framework/impl/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/impl/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,19 +3,19 @@
 		<parent>
 		<artifactId>impl-parent</artifactId>
 		<groupId>org.richfaces.framework</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 		<relativePath>../impl-parent/pom.xml</relativePath>
 		</parent>
 	-->
 	<parent>
 		<artifactId>framework</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.framework</groupId>
 	<artifactId>richfaces-impl</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>Java Server Faces AJAX framework implementation</name>
 	<build>
 		<resources>
@@ -285,7 +285,7 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<properties>
Modified: tags/3.1.1-CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/richfaces/VersionBean.java	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/impl/src/main/java/org/richfaces/VersionBean.java	2007-09-27 23:29:10 UTC (rev 3162)
@@ -37,7 +37,7 @@
 	 * Revision version, must be auto modified by CVS 
 	 */
 	
-	public static final String REVISION = "1-SNAPSHOT" ;
+	public static final String REVISION = "1-CR1" ;
 	public static final String SCM_REVISION = "	SVN $Revision$ $Date$";//$Revision$ $Date$";
 	public static final Version _version = new Version();
 	
Modified: tags/3.1.1-CR1/framework/impl-parent/pom.xml
===================================================================
--- branches/3.1.x/framework/impl-parent/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/impl-parent/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,12 +5,12 @@
 	<parent>
 		<artifactId>framework</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.framework</groupId>
 	<artifactId>impl-parent</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>pom</packaging>
 	<name>
 		Java Server Faces AJAX framework implementation parent file
@@ -203,7 +203,7 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<properties>
Modified: tags/3.1.1-CR1/framework/pom.xml
===================================================================
--- branches/3.1.x/framework/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
 	<artifactId>framework</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>pom</packaging>
 	<name>Java Server Faces AJAX framework</name>
 	<dependencies />
Modified: tags/3.1.1-CR1/framework/test/pom.xml
===================================================================
--- branches/3.1.x/framework/test/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/framework/test/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>framework</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.framework</groupId>
   <artifactId>richfaces-test</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</dependency>
 	<dependency>
 		<groupId>htmlunit</groupId>
Modified: tags/3.1.1-CR1/pom.xml
===================================================================
--- branches/3.1.x/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -1,12 +1,10 @@
-<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
 	<artifactId>root</artifactId>
 	<packaging>pom</packaging>
 	<name>Jboss RichFaces project</name>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<url>http://labs.jboss.com/jbossrichfaces</url>
 	<properties>
 		<snapshotRepository>
@@ -131,13 +129,9 @@
 		</license>
 	</licenses>
 	<scm>
-		<connection>
-			scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/3.1.x
-		</connection>
-		<developerConnection>
-			scm:svn:https://svn.jboss.org/repos/richfaces/branches/3.1.x
-		</developerConnection>
-		<url>https://svn.jboss.org/repos/richfaces/branches/3.1.x</url>
+		<connection>scm:svn:https://svn.jboss.org/repos/richfaces/tags/3.1.1-CR1</connection>
+		<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/3.1.1-CR1</developerConnection>
+		<url>https://svn.jboss.org/repos/richfaces/branches/3.1.1-CR1</url>
 	</scm>
 	<profiles>
 		<profile>
Modified: tags/3.1.1-CR1/samples/ajaxPortlet/pom.xml
===================================================================
--- branches/3.1.x/samples/ajaxPortlet/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/ajaxPortlet/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,12 +5,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>portalAjaxSample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<description>Ajax JSF sample portlet</description>
 	<build>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.richfaces.extensions</groupId>
 			<artifactId>portlet</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.faces</groupId>
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/samples/calendar-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/calendar-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/calendar-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,29 +3,29 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>calendar-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>calendar-sample Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>calendar</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<build>
Modified: tags/3.1.1-CR1/samples/dataFilterSliderDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/dataFilterSliderDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/dataFilterSliderDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,29 +2,29 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces</groupId>
     <artifactId>dataFilterSliderDemo</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>dataFilterSliderDemo Maven Webapp</name>
     <dependencies>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>richfaces-ui</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>dataFilterSlider</artifactId>
-	        <version>3.1.1-SNAPSHOT</version>
+	        <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/dataTableDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/dataTableDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/dataTableDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>dataTableDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/datascroller-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/datascroller-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/datascroller-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>datascroller-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/dragDropDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/dragDropDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/dragDropDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>dragDropDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/dropdownmenu-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/dropdownmenu-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/dropdownmenu-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>dropdownmenu-sample</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>menu-components</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/effect-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/effect-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/effect-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>effect-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>effect Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>effect</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<build>
Modified: tags/3.1.1-CR1/samples/gmap-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/gmap-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/gmap-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,19 +2,19 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>gmap-sample</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>gmap-sample Maven Webapp</name>
     <dependencies>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>gmap</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/inputNumberSliderDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/inputNumberSliderDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/inputNumberSliderDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>inputNumberSliderDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/inputNumberSpinnerDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/inputNumberSpinnerDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/inputNumberSpinnerDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>inputNumberSpinnerDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/local-value-demo/pom.xml
===================================================================
--- branches/3.1.x/samples/local-value-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/local-value-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,24 +2,24 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>local-value-demo</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</dependency>
 	<dependency>
 		<groupId>org.richfaces.ui</groupId>
 		<artifactId>core</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 		<scope>provided</scope>
 	</dependency>
     </dependencies>
Modified: tags/3.1.1-CR1/samples/modalpanel-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/modalpanel-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/modalpanel-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,24 +2,24 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>modalpanel-sample</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>modalpanel-sample Maven Webapp</name>
     <dependencies>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>modal-panel</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/panel-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/panel-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/panel-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,24 +2,24 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>panel-sample</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>panel-sample Maven Webapp</name>
     <dependencies>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>panel</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/panelbar-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/panelbar-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/panelbar-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>panelbar-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/panelmenu-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/panelmenu-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/panelmenu-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>panelmenu-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>panelmenu-sample Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>panelmenu</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 
Modified: tags/3.1.1-CR1/samples/pom.xml
===================================================================
--- branches/3.1.x/samples/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,14 +3,14 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<url>http://labs.jboss.com/jbossrichfaces/samples</url>
 	<properties>
 		<!-- -->
@@ -67,12 +67,12 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-impl</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
@@ -361,7 +361,7 @@
 				<dependency>
 					<groupId>org.richfaces.framework</groupId>
 					<artifactId>richfaces-impl</artifactId>
-					<version>3.1.1-SNAPSHOT</version>
+					<version>3.1.1-CR1</version>
 					<exclusions>
 						<exclusion>
 							<groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/samples/portal-echo/pom.xml
===================================================================
--- branches/3.1.x/samples/portal-echo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/portal-echo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>portal-echo</artifactId>
 	<packaging>war</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<description>Ajax JSF sample portlet</description>
 	<build>
 		<defaultGoal>package</defaultGoal>
Modified: tags/3.1.1-CR1/samples/rich-message-demo/pom.xml
===================================================================
--- branches/3.1.x/samples/rich-message-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/rich-message-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,29 +3,29 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>rich-message-demo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>rich-message-demo</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>message</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 
Modified: tags/3.1.1-CR1/samples/richfaces-art-datatable/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-art-datatable/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-art-datatable/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,19 +3,19 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>richfaces-art-datatable</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>richfaces-art-datatableDemo Maven Webapp</name>
     <dependencies>
        <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>richfaces-ui</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/richfaces-demo/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,19 +2,19 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>richfaces-demo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>richfaces-demo Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.uwyn</groupId>
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
Modified: tags/3.1.1-CR1/samples/richfaces-ear-demo/ejb/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-ear-demo/ejb/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-ear-demo/ejb/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>richfaces-ear-demo</artifactId>
 		<groupId>org.richfaces.samples</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 	<artifactId>ejb</artifactId>
 	<packaging>ejb</packaging>
 	<name>ejb</name>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/samples/richfaces-ear-demo/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-ear-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-ear-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,14 +4,14 @@
   <parent>
     <artifactId>root</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.samples</groupId>
   <artifactId>richfaces-ear-demo</artifactId>
   <name>JSF 1.2/Jee5 enterprise application demo</name>
   <packaging>pom</packaging>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1-CR1</version>
         <build>
                 <pluginManagement>
                         <plugins>
Modified: tags/3.1.1-CR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-ear-demo/richfacesEAR/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-ear-demo/richfacesEAR/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,32 +4,32 @@
 	<parent>
 		<artifactId>richfaces-ear-demo</artifactId>
 		<groupId>org.richfaces.samples</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 	<artifactId>richfacesEAR</artifactId>
 	<name>richfacesEAR</name>
 	<packaging>ear</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 			<artifactId>ejb</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<type>ejb</type>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 			<artifactId>ejb</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<type>ejb-client</type>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 			<artifactId>webapp</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<type>war</type>
 		</dependency>
 	</dependencies>
Modified: tags/3.1.1-CR1/samples/richfaces-ear-demo/webapp/pom.xml
===================================================================
--- branches/3.1.x/samples/richfaces-ear-demo/webapp/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/richfaces-ear-demo/webapp/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,14 +4,14 @@
 	<parent>
 		<artifactId>richfaces-ear-demo</artifactId>
 		<groupId>org.richfaces.samples</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 	<artifactId>webapp</artifactId>
 	<packaging>war</packaging>
 	<name>webapp Maven Webapp</name>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<url>http://maven.apache.org</url>
 	<build>
 		<finalName>webapp</finalName>
@@ -48,17 +48,17 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-impl</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -71,7 +71,7 @@
 			<dependency>
 			<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
 			<artifactId>ejb</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<type>ejb-client</type>
 			<scope>provided</scope>
 			<optional>true</optional>
Modified: tags/3.1.1-CR1/samples/scrollableDataTableDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/scrollableDataTableDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/scrollableDataTableDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,34 +4,34 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>scrollableDataTableDemo</artifactId>
 	<groupId>org.richfaces.samples</groupId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>scrollableDataTable Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>scrollableDataTable</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	    <dependency>
 	      <groupId>org.richfaces.ui</groupId>
 	      <artifactId>dataTable</artifactId>
-	      <version>3.1.1-SNAPSHOT</version>
+	      <version>3.1.1-CR1</version>
 	    </dependency>
 	</dependencies>
 
Modified: tags/3.1.1-CR1/samples/seamEAR/ear/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/ear/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/ear/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -6,18 +6,18 @@
 	<groupId>org.richfaces.samples.seamEAR</groupId>
 	<artifactId>ear</artifactId>
 	<packaging>ear</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>ear assembly</name>
 	<parent>
 		<groupId>org.richfaces.samples</groupId>
 		<artifactId>seamEAR</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/samples/seamEAR/ejbs/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/ejbs/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/ejbs/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -6,12 +6,12 @@
 	<groupId>org.richfaces.samples.seamEAR</groupId>
 	<artifactId>ejbs</artifactId>
 	<packaging>ejb</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>enterprise java beans</name>
 	<parent>
 		<groupId>org.richfaces.samples</groupId>
 		<artifactId>seamEAR</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/samples/seamEAR/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -6,12 +6,12 @@
 		<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 		</parent>
 	-->
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<artifactId>seamEAR</artifactId>
 	<packaging>pom</packaging>
 	<name>seam EAR project</name>
@@ -58,23 +58,23 @@
 					org.richfaces.samples.seamEAR.projects
 				</groupId>
 				<artifactId>logging</artifactId>
-				<version>3.1.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.richfaces.samples.seamEAR</groupId>
 				<artifactId>primary-source</artifactId>
-				<version>3.1.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.richfaces.samples.seamEAR.wars</groupId>
 				<artifactId>seamWebapp</artifactId>
-				<version>3.1.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 				<type>war</type>
 			</dependency>
 			<dependency>
 				<groupId>org.richfaces.samples.seamEAR</groupId>
 				<artifactId>ejbs</artifactId>
-				<version>3.1.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 				<type>ejb</type>
 			</dependency>
 		</dependencies>
Modified: tags/3.1.1-CR1/samples/seamEAR/primary-source/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/primary-source/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/primary-source/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.richfaces.samples</groupId>
       <artifactId>seamEAR</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
    </parent>
    <dependencies>
       <dependency>
Modified: tags/3.1.1-CR1/samples/seamEAR/projects/logging/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/projects/logging/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/projects/logging/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.richfaces.samples.seamEAR</groupId>
       <artifactId>projects</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
    </parent>
 </project>
Modified: tags/3.1.1-CR1/samples/seamEAR/projects/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/projects/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/projects/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -1,14 +1,14 @@
 <project>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.richfaces.samples.seamEAR</groupId>
-   <version>3.1.1-SNAPSHOT</version>
+   <version>3.1.1-CR1</version>
    <artifactId>projects</artifactId>
    <packaging>pom</packaging>
    <name>sub projects</name>
    <parent>
       <groupId>org.richfaces.samples</groupId>
       <artifactId>seamEAR</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
    </parent>
    <modules>
       <module>logging</module>
Modified: tags/3.1.1-CR1/samples/seamEAR/wars/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/wars/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/wars/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,11 +4,11 @@
    <artifactId>wars</artifactId>
    <packaging>pom</packaging>
    <name>wars</name>
-   <version>3.1.1-SNAPSHOT</version>
+   <version>3.1.1-CR1</version>
    <parent>
       <groupId>org.richfaces.samples</groupId>
       <artifactId>seamEAR</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
    </parent>
    <modules>
       <module>seamWebapp</module>
Modified: tags/3.1.1-CR1/samples/seamEAR/wars/seamWebapp/pom.xml
===================================================================
--- branches/3.1.x/samples/seamEAR/wars/seamWebapp/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamEAR/wars/seamWebapp/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.richfaces.samples.seamEAR</groupId>
 		<artifactId>wars</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<build>
 	<finalName>seamWebapp</finalName>
@@ -42,17 +42,17 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-impl</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
Modified: tags/3.1.1-CR1/samples/seamIntegration/pom.xml
===================================================================
--- branches/3.1.x/samples/seamIntegration/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/seamIntegration/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,14 +5,14 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>seamIntegration</artifactId>
 	<packaging>war</packaging>
 	<name>seamIntegration Maven Webapp</name>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<build>
 		<finalName>seamIntegration</finalName>
 		<plugins>
Modified: tags/3.1.1-CR1/samples/separator-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/separator-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/separator-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>separator-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/simpleTogglePanel-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/simpleTogglePanel-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/simpleTogglePanel-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>simpleTogglePanel-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/skins/pom.xml
===================================================================
--- branches/3.1.x/samples/skins/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/skins/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
Modified: tags/3.1.1-CR1/samples/suggestionbox-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/suggestionbox-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/suggestionbox-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>suggestionbox-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>suggestionbox</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/tabPanelDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/tabPanelDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/tabPanelDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>tabPanelDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>panel</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/togglePanel-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/togglePanel-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/togglePanel-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>togglePanel-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>panel</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/tomahawkCompability/pom.xml
===================================================================
--- branches/3.1.x/samples/tomahawkCompability/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/tomahawkCompability/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -8,7 +8,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>tomahawkCompability</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>tomahawkCompability Maven Webapp</name>
 	<properties>
Modified: tags/3.1.1-CR1/samples/toolBarDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/toolBarDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/toolBarDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,12 +2,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>toolBarDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/samples/tooltip-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/tooltip-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/tooltip-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>tooltip-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>tooltip-sample Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>tooltip</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 
Modified: tags/3.1.1-CR1/samples/tree-demo/pom.xml
===================================================================
--- branches/3.1.x/samples/tree-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/tree-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,29 +2,29 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.richfaces.samples</groupId>
     <artifactId>tree-demo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
     <packaging>war</packaging>
     <name>tree-demo Maven Webapp</name>
     <dependencies>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>tree</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>drag-drop</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
     </dependencies>
     <build>
Modified: tags/3.1.1-CR1/samples/treeModelDemo/pom.xml
===================================================================
--- branches/3.1.x/samples/treeModelDemo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/treeModelDemo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,24 +3,24 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>treeModelDemo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>Tree Model Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>treeModel</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>tree</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<build>
Modified: tags/3.1.1-CR1/samples/useCases/pom.xml
===================================================================
--- branches/3.1.x/samples/useCases/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/useCases/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -5,12 +5,12 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>useCases</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>useCases Maven Webapp</name>
 	<build>
Modified: tags/3.1.1-CR1/samples/virtualEarth-sample/pom.xml
===================================================================
--- branches/3.1.x/samples/virtualEarth-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/samples/virtualEarth-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -4,19 +4,19 @@
 	<parent>
 		<artifactId>samples</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.samples</groupId>
 	<artifactId>virtualEarth-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<packaging>war</packaging>
 	<name>gmap-sample Maven Webapp</name>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>virtualEarth</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	</dependencies>
 	<build>
Modified: tags/3.1.1-CR1/sandbox/api/pom.xml
===================================================================
--- branches/3.1.x/sandbox/api/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/api/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,18 +2,18 @@
 	<parent>
 		<artifactId>sandbox</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.sandbox</groupId>
 	<artifactId>richfaces-sandbox-api</artifactId>
 	<name>Richfaces Sandbox API</name>	
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 	<dependency>
 	    <groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/sandbox/impl/pom.xml
===================================================================
--- branches/3.1.x/sandbox/impl/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/impl/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,28 +2,28 @@
 	<parent>
 		<artifactId>sandbox</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.sandbox</groupId>
 	<artifactId>richfaces-sandbox-impl</artifactId>
 	<name>Richfaces Sandbox Implementation</name>	
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.richfaces.sandbox</groupId>
 			<artifactId>richfaces-sandbox-api</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-impl</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 		  <groupId>org.richfaces.framework</groupId>
 		  <artifactId>richfaces-test</artifactId>
-		  <version>3.1.1-SNAPSHOT</version>
+		  <version>3.1.1-CR1</version>
 		</dependency>
 	<dependency>
 	    <groupId>javax.faces</groupId>
Modified: tags/3.1.1-CR1/sandbox/pom.xml
===================================================================
--- branches/3.1.x/sandbox/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
Modified: tags/3.1.1-CR1/sandbox/samples/dialog-window-sample/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/dialog-window-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/samples/dialog-window-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>samples</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
  
 	<modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,12 @@
   	<dependency>
 		<groupId>org.richfaces.sandbox.ui</groupId>
 	    <artifactId>dialog-window</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
   	</dependency>
   	<dependency>
 		<groupId>org.richfaces.samples</groupId>
 	    <artifactId>skins</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
   	</dependency>
   	
   </dependencies>	
Modified: tags/3.1.1-CR1/sandbox/samples/panel2-sample/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/panel2-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/samples/panel2-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>samples</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
  
 	<modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,12 @@
   	<dependency>
 		<groupId>org.richfaces.sandbox.ui</groupId>
 	    <artifactId>panel2</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
   	</dependency>
   	<dependency>
 		<groupId>org.richfaces.samples</groupId>
 	    <artifactId>skins</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
   	</dependency>
   	
   </dependencies>	
Modified: tags/3.1.1-CR1/sandbox/samples/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/samples/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.richfaces</groupId>
 		<artifactId>samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
Modified: tags/3.1.1-CR1/sandbox/samples/rich-message-demo/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/rich-message-demo/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/samples/rich-message-demo/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>samples</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.demo</groupId>
@@ -13,17 +13,17 @@
 		<dependency>
 			<groupId>org.richfaces.sandbox.ui</groupId>
 			<artifactId>message</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			</dependency>
 		<dependency>
 			<groupId>org.richfaces.samples</groupId>
 			<artifactId>skins</artifactId>
-		     <version>3.1.1-SNAPSHOT</version>
+		     <version>3.1.1-CR1</version>
 	    </dependency>
 	    <dependency>
       		<groupId>org.richfaces.ui</groupId>
       		<artifactId>richfaces-ui</artifactId>
-      		<version>3.1.1-SNAPSHOT</version>
+      		<version>3.1.1-CR1</version>
     	</dependency>
     </dependencies>
 	
Modified: tags/3.1.1-CR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml
===================================================================
--- branches/3.1.x/sandbox/samples/simpleTogglePanel2-sample/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/samples/simpleTogglePanel2-sample/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>samples</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces</groupId>
@@ -16,12 +16,12 @@
     <dependency>
       <groupId>org.richfaces.sandbox.ui</groupId>
       <artifactId>simpleTogglePanel2</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
         <dependency>
             <groupId>org.richfaces.samples</groupId>
             <artifactId>skins</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1.1-CR1</version>
         </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/sandbox/ui/dialog-window/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/dialog-window/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/ui/dialog-window/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.sandbox.ui</groupId>
@@ -13,7 +13,7 @@
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
     <dependency>
       <groupId>org.richfaces.ui</groupId>
       <artifactId>core</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
Modified: tags/3.1.1-CR1/sandbox/ui/panel2/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/panel2/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/ui/panel2/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.sandbox.ui</groupId>
@@ -13,7 +13,7 @@
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
 		<id>generate-sources</id>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/sandbox/ui/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/ui/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces.sandbox</groupId>
Modified: tags/3.1.1-CR1/sandbox/ui/simpleTogglePanel2/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/simpleTogglePanel2/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/ui/simpleTogglePanel2/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.sandbox.ui</groupId>
@@ -13,7 +13,7 @@
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-	    <version>3.1.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/sandbox/ui/state/pom.xml
===================================================================
--- branches/3.1.x/sandbox/ui/state/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/sandbox/ui/state/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces.sandbox</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/test-applications/facelets/pom.xml
===================================================================
--- branches/3.1.x/test-applications/facelets/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/test-applications/facelets/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>test-applications</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
 
 	<modelVersion>4.0.0</modelVersion>
Modified: tags/3.1.1-CR1/test-applications/jsp/pom.xml
===================================================================
--- branches/3.1.x/test-applications/jsp/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/test-applications/jsp/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>test-applications</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
 
 	<modelVersion>4.0.0</modelVersion>
Modified: tags/3.1.1-CR1/test-applications/pom.xml
===================================================================
--- branches/3.1.x/test-applications/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/test-applications/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
     		<artifactId>samples</artifactId>
     		<groupId>org.richfaces</groupId>
-	    	<version>3.1.1-SNAPSHOT</version>
+	    	<version>3.1.1-CR1</version>
 		<relativePath>../samples</relativePath>
 	</parent>
 
@@ -43,11 +43,11 @@
 	<groupId>org.richfaces</groupId>
 	<artifactId>test-applications</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
 	<name>RichFaces Test Applications</name>
 
 	<properties>
-		<rfVersion>3.1.1-SNAPSHOT</rfVersion>
+		<rfVersion>3.1.1-CR1</rfVersion>
 	</properties>
 
 	<modules>
Modified: tags/3.1.1-CR1/ui/assembly/pom.xml
===================================================================
--- branches/3.1.x/ui/assembly/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/assembly/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 				<configuration>
 					<library>
 						<prefix>org.richfaces</prefix>
Modified: tags/3.1.1-CR1/ui/calendar/pom.xml
===================================================================
--- branches/3.1.x/ui/calendar/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/calendar/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/core/pom.xml
===================================================================
--- branches/3.1.x/ui/core/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/core/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/create.bat
===================================================================
--- branches/3.1.x/ui/create.bat	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/create.bat	2007-09-27 23:29:10 UTC (rev 3162)
@@ -1 +1 @@
-mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1
\ No newline at end of file
+mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.1.1-CR1 -DgroupId=org.richfaces -DartifactId=%1
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/create.sh
===================================================================
--- branches/3.1.x/ui/create.sh	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/create.sh	2007-09-27 23:29:10 UTC (rev 3162)
@@ -1,3 +1,3 @@
 #!/bin/sh
 mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component \
-   -DarchetypeVersion=3.1.1-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=$1
+   -DarchetypeVersion=3.1.1-CR1 -DgroupId=org.richfaces.ui -DartifactId=$1
Modified: tags/3.1.1-CR1/ui/dataFilterSlider/pom.xml
===================================================================
--- branches/3.1.x/ui/dataFilterSlider/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/dataFilterSlider/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/dataTable/pom.xml
===================================================================
--- branches/3.1.x/ui/dataTable/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/dataTable/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -45,7 +45,7 @@
 			<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui-core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			</dependency>
 		-->
 	</dependencies>
Modified: tags/3.1.1-CR1/ui/datascroller/pom.xml
===================================================================
--- branches/3.1.x/ui/datascroller/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/datascroller/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/drag-drop/pom.xml
===================================================================
--- branches/3.1.x/ui/drag-drop/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/drag-drop/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>ui</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</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.1-SNAPSHOT</version>
+				<version>3.1.1-CR1</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -45,7 +45,7 @@
 			<dependency>
 			<groupId>org.richfaces.ui</groupId>
 			<artifactId>richfaces-ui-core</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			</dependency>
 		-->
 	</dependencies>
Modified: tags/3.1.1-CR1/ui/dropdown-menu/pom.xml
===================================================================
--- branches/3.1.x/ui/dropdown-menu/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/dropdown-menu/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,12 +44,12 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
     <dependency>
       <groupId>org.richfaces.ui</groupId>
       <artifactId>menu-components</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/effect/pom.xml
===================================================================
--- branches/3.1.x/ui/effect/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/effect/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/gmap/pom.xml
===================================================================
--- branches/3.1.x/ui/gmap/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/gmap/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/inputnumber-slider/pom.xml
===================================================================
--- branches/3.1.x/ui/inputnumber-slider/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/inputnumber-slider/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+     	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/inputnumber-spinner/pom.xml
===================================================================
--- branches/3.1.x/ui/inputnumber-spinner/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/inputnumber-spinner/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+    	<version>3.1.1-CR1</version>
         <executions>
           <execution>
 		<id>generate-sources</id>
Modified: tags/3.1.1-CR1/ui/insert/pom.xml
===================================================================
--- branches/3.1.x/ui/insert/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/insert/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/menu-components/pom.xml
===================================================================
--- branches/3.1.x/ui/menu-components/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/menu-components/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/message/pom.xml
===================================================================
--- branches/3.1.x/ui/message/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/message/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.ui</groupId>
   <artifactId>message</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1-CR1</version>
   <name>Message</name>	
   <build>
     <plugins>
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/modal-panel/pom.xml
===================================================================
--- branches/3.1.x/ui/modal-panel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/modal-panel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+    	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/paint2D/pom.xml
===================================================================
--- branches/3.1.x/ui/paint2D/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/paint2D/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/panel/pom.xml
===================================================================
--- branches/3.1.x/ui/panel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/panel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
 		<id>generate-sources</id>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/panelbar/pom.xml
===================================================================
--- branches/3.1.x/ui/panelbar/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/panelbar/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
Modified: tags/3.1.1-CR1/ui/panelmenu/pom.xml
===================================================================
--- branches/3.1.x/ui/panelmenu/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/panelmenu/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/pom.xml
===================================================================
--- branches/3.1.x/ui/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>root</artifactId>
 		<groupId>org.richfaces</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.1-CR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.richfaces</groupId>
@@ -129,12 +129,12 @@
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-impl</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.richfaces.framework</groupId>
 			<artifactId>richfaces-test</artifactId>
-			<version>3.1.1-SNAPSHOT</version>
+			<version>3.1.1-CR1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
Modified: tags/3.1.1-CR1/ui/scrollableDataTable/pom.xml
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/scrollableDataTable/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,19 +2,19 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.richfaces.ui</groupId>
   <artifactId>scrollableDataTable</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</version>
   <name>Scrollable Data Table</name>
   <build>
     <plugins>
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-cdk-plugin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -71,12 +71,12 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
     <dependency>
       <groupId>org.richfaces.ui</groupId>
       <artifactId>dataTable</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
Modified: tags/3.1.1-CR1/ui/separator/pom.xml
===================================================================
--- branches/3.1.x/ui/separator/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/separator/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
 		<id>generate-sources</id>
Modified: tags/3.1.1-CR1/ui/simpleTogglePanel/pom.xml
===================================================================
--- branches/3.1.x/ui/simpleTogglePanel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/simpleTogglePanel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/spacer/pom.xml
===================================================================
--- branches/3.1.x/ui/spacer/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/spacer/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/suggestionbox/pom.xml
===================================================================
--- branches/3.1.x/ui/suggestionbox/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/suggestionbox/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>ui</artifactId>
         <groupId>org.richfaces</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+                <version>3.1.1-CR1</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
     </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/tabPanel/pom.xml
===================================================================
--- branches/3.1.x/ui/tabPanel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/tabPanel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/togglePanel/pom.xml
===================================================================
--- branches/3.1.x/ui/togglePanel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/togglePanel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	  <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/toolBar/pom.xml
===================================================================
--- branches/3.1.x/ui/toolBar/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/toolBar/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/tooltip/pom.xml
===================================================================
--- branches/3.1.x/ui/tooltip/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/tooltip/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/tree/pom.xml
===================================================================
--- branches/3.1.x/ui/tree/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/tree/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	<version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -45,7 +45,7 @@
     <dependency>
      <groupId>org.richfaces.ui</groupId>
      <artifactId>drag-drop</artifactId>
-     <version>3.1.1-SNAPSHOT</version>
+     <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/treeModel/pom.xml
===================================================================
--- branches/3.1.x/ui/treeModel/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/treeModel/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+        <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -45,12 +45,12 @@
     <dependency>
       <groupId>org.richfaces.framework</groupId>
       <artifactId>richfaces-impl</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
     <dependency>
       <groupId>org.richfaces.ui</groupId>
       <artifactId>tree</artifactId>
-      <version>3.1.1-SNAPSHOT</version>
+      <version>3.1.1-CR1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
Modified: tags/3.1.1-CR1/ui/virtualEarth/pom.xml
===================================================================
--- branches/3.1.x/ui/virtualEarth/pom.xml	2007-09-27 22:24:57 UTC (rev 3161)
+++ tags/3.1.1-CR1/ui/virtualEarth/pom.xml	2007-09-27 23:29:10 UTC (rev 3162)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>ui</artifactId>
     <groupId>org.richfaces</groupId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.1-CR1</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.1-SNAPSHOT</version>
+	    <version>3.1.1-CR1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3160 - in branches/3.1.x: framework/impl/src/main/java/org/ajax4jsf/event and 6 other directories.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: alexsmirnov
Date: 2007-09-27 18:12:10 -0400 (Thu, 27 Sep 2007)
New Revision: 3160
Added:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java
Modified:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
   branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java
   branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
   branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
   branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
   branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
   branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java
Log:
fix for a http://jira.jboss.org/jira/browse/RF-1004 merged from trunk.
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -22,6 +22,7 @@
 package org.ajax4jsf.component;
 
 import java.io.IOException;
+import java.util.NoSuchElementException;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
@@ -34,16 +35,13 @@
 
 import org.ajax4jsf.Messages;
 import org.ajax4jsf.application.AjaxSingleException;
-import org.ajax4jsf.component.AjaxContainer;
 import org.ajax4jsf.context.AjaxContext;
 import org.ajax4jsf.context.AjaxContextImpl;
 import org.ajax4jsf.context.InvokerCallback;
 import org.ajax4jsf.context.ViewIdHolder;
 import org.ajax4jsf.event.AjaxListener;
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.renderkit.AjaxContainerRenderer;
-import org.apache.commons.collections.Buffer;
-import org.apache.commons.collections.BufferUnderflowException;
-import org.apache.commons.collections.UnboundedFifoBuffer;
 
 /**
  * Custom ViewRoot for support render parts of tree for Ajax requests. Main
@@ -149,9 +147,9 @@
          *                phase, for wich events must be processed.
          */
     void broadcastEvents(FacesContext context, PhaseId phaseId) {
-	Buffer[] events = getEvents(context);
-	Buffer anyPhaseEvents = events[PhaseId.ANY_PHASE.getOrdinal()];
-	Buffer phaseEvents = events[phaseId.getOrdinal()];
+	EventsQueue[] events = getEvents(context);
+	EventsQueue anyPhaseEvents = events[PhaseId.ANY_PHASE.getOrdinal()];
+	EventsQueue phaseEvents = events[phaseId.getOrdinal()];
 	if (phaseEvents.isEmpty() && anyPhaseEvents.isEmpty())
 	    return;
 	// FacesEvent event = null;
@@ -176,7 +174,7 @@
          * @param phaseEventsQueue
          * @param havePhaseEvents
          */
-    public void processEvents(Buffer phaseEventsQueue, boolean havePhaseEvents) {
+    public void processEvents(EventsQueue phaseEventsQueue, boolean havePhaseEvents) {
 	FacesEvent event;
 	while (havePhaseEvents) {
 	    try {
@@ -195,20 +193,20 @@
 		    // clearEvents();
 		    // return;
 		}
-	    } catch (BufferUnderflowException e) {
+	    } catch (NoSuchElementException e) {
 		havePhaseEvents = false;
 	    }
 	}
     }
 
     public void broadcastAjaxEvents(FacesContext context) {
-	Buffer queue = getAjaxEventsQueue(context);
+	EventsQueue queue = getAjaxEventsQueue(context);
 	processEvents(queue, !queue.isEmpty());
     }
 
-    private Buffer[] events;
+    private EventsQueue[] events;
 
-    private Buffer ajaxEvents = new UnboundedFifoBuffer();
+    private EventsQueue ajaxEvents = new EventsQueue();
 
     /**
          * Use FIFO buffers for hold Faces Events. Hold this buffers in Request
@@ -219,14 +217,14 @@
          * @param phase
          * @return
          */
-    protected Buffer getEventsQueue(FacesContext context, PhaseId phase) {
+    protected EventsQueue getEventsQueue(FacesContext context, PhaseId phase) {
 	return getEvents(context)[phase.getOrdinal()];
     }
 
     /**
          * @return
          */
-    protected Buffer[] getEvents(FacesContext context) {
+    protected EventsQueue[] getEvents(FacesContext context) {
 	if (events == null) {
 	    clearEvents(context);
 	}
@@ -239,16 +237,16 @@
          * @param context
          * @return
          */
-    protected Buffer getAjaxEventsQueue(FacesContext context) {
+    protected EventsQueue getAjaxEventsQueue(FacesContext context) {
 
 	return ajaxEvents;
     }
 
     public void clearEvents(FacesContext context) {
 	int len;
-	events = new Buffer[len = PhaseId.VALUES.size()];
+	events = new EventsQueue[len = PhaseId.VALUES.size()];
 	for (int i = 0; i < len; i++) {
-	    events[i] = new UnboundedFifoBuffer();
+	    events[i] = new EventsQueue();
 	}
     }
 
Copied: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java (from rev 3159, trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java)
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java	                        (rev 0)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -0,0 +1,97 @@
+/**
+ * 
+ */
+package org.ajax4jsf.event;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+
+import javax.faces.event.FacesEvent;
+
+/**
+ * Very simple implementation of FIFO buffer, to organize JSF events queue.
+ * @author asmirnov
+ *
+ */
+public class EventsQueue  {
+	
+	private QueueElement first;
+	
+	private QueueElement last;
+
+	/**
+	 * Remove and return first queued event.
+	 * @return faces event form top of queue
+	 * @throws NoSuchElementException , if queue is empty.
+	 */
+	public FacesEvent remove() throws NoSuchElementException {
+		if(isEmpty()){
+			throw new NoSuchElementException("Events queue is empty");
+		}
+		FacesEvent element = first.getElement();
+		first = first.getPrevisious();
+		if(null == first){
+			last = null;
+		}
+		return element;
+	}
+
+	/**
+	 * Add event to queue.
+	 * @param element
+	 */
+	public void add(FacesEvent element) {
+		QueueElement queueElement = new QueueElement(element);
+		if(isEmpty()){
+			first = last = queueElement;
+		} else {
+			last.setPrevisious(queueElement);
+			last = queueElement;
+		}
+	}
+
+	public void clear() {
+		first = last = null;
+	}
+
+	public boolean isEmpty() {		
+		return null == first;
+	}
+
+	private static class QueueElement {
+		
+		private QueueElement previsious;
+		
+		private FacesEvent element;
+
+		public QueueElement(FacesEvent element) {
+			this.element = element;
+		}
+
+		
+		/**
+		 * @param previsious the previsious to set
+		 */
+		public void setPrevisious(QueueElement previsious) {
+			this.previsious = previsious;
+		}
+
+
+		/**
+		 * @return the previsious
+		 */
+		public QueueElement getPrevisious() {
+			return previsious;
+		}
+
+		/**
+		 * @return the element
+		 */
+		public FacesEvent getElement() {
+			return element;
+		}
+		
+	}
+}
Modified: branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java
===================================================================
--- branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -25,7 +25,7 @@
 import javax.faces.event.PhaseId;
 
 import org.ajax4jsf.component.AjaxViewRoot;
-import org.apache.commons.collections.Buffer;
+import org.ajax4jsf.event.EventsQueue;
 
 /**
  * @author Nick - mailto:nbelaevski@exadel.com
@@ -34,15 +34,15 @@
  */
 public class MockViewRoot extends AjaxViewRoot {
 
-	public Buffer getAjaxEventsQueue(FacesContext context) {
+	public EventsQueue getAjaxEventsQueue(FacesContext context) {
 		return super.getAjaxEventsQueue(context);
 	}
 
-	public Buffer[] getEvents(FacesContext context) {
+	public EventsQueue[] getEvents(FacesContext context) {
 		return super.getEvents(context);
 	}
 
-	public Buffer getEventsQueue(FacesContext context, PhaseId phase) {
+	public EventsQueue getEventsQueue(FacesContext context, PhaseId phase) {
 		return super.getEventsQueue(context, phase);
 	}
 
Modified: branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -1,18 +1,23 @@
 package org.richfaces.component;
- 
+
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIPanel;
 import javax.faces.component.html.HtmlForm;
+import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
+import org.ajax4jsf.event.EventsQueue;
+import org.ajax4jsf.resource.InternetResource;
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.ResourceBuilderImpl;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
 import org.apache.commons.lang.StringUtils;
 import org.richfaces.renderkit.DraggableRendererContributor;
 import org.richfaces.renderkit.DropzoneRendererContributor;
@@ -21,13 +26,13 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlScript;
 
- /**
-  * Unit test for simple Component.
-  */
+/**
+ * Unit test for simple Component.
+ */
 public class DragDropTest extends AbstractAjax4JsfTestCase {
- 
+
 	private UIDndParam dndparam;
- 
+
 	private UIDragIndicator dndindicator;
 
 	private UIDragSupport dragsupport;
@@ -38,6 +43,8 @@
 
 	private UIComponent form;
 
+	private static final String CSS_FILE_PATH = "org/richfaces/renderkit/html/css/dragIndicator.xcss";
+
 	private static Set javaScripts = new HashSet();
 	static {
 		javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
@@ -46,27 +53,20 @@
 		javaScripts.add("org.ajax4jsf.javascript.DnDScript");
 		javaScripts.add("scripts/events.js");
 		javaScripts.add("scripts/utils.js");
-		javaScripts
-				.add("scripts/simple-draggable.js");
-		javaScripts
-				.add("scripts/simple-dropzone.js");
+		javaScripts.add("scripts/simple-draggable.js");
+		javaScripts.add("scripts/simple-dropzone.js");
 		javaScripts.add("scripts/json/json-mini.js");
-		javaScripts
-				.add("scripts/json/json-dom.js");
-		javaScripts
-				.add("scripts/dnd/dnd-common.js");
-		javaScripts
-				.add("scripts/dnd/dnd-dropzone.js");
-		javaScripts
-				.add("scripts/dnd/dnd-draggable.js");
-		javaScripts
-				.add("scripts/drag-indicator.js");
+		javaScripts.add("scripts/json/json-dom.js");
+		javaScripts.add("scripts/dnd/dnd-common.js");
+		javaScripts.add("scripts/dnd/dnd-dropzone.js");
+		javaScripts.add("scripts/dnd/dnd-draggable.js");
+		javaScripts.add("scripts/drag-indicator.js");
 	}
 	private static Set eventsSet = new HashSet();
 	static {
 		eventsSet.add("org.richfaces.component.html.HtmlDragSupport");
 		eventsSet.add("org.richfaces.component.html.HtmlDropSupport");
-		
+
 	}
 
 	public DragDropTest(String testName) {
@@ -185,30 +185,37 @@
 	}
 
 	public void testDecode() throws Exception {
-
-		SetUp();
-		externalContext.addRequestParameterMap(DraggableRendererContributor.DRAG_SOURCE_ID, dragsupport.getClientId(facesContext));
-		externalContext.addRequestParameterMap(DropzoneRendererContributor.DROP_TARGET_ID, dropsupport.getClientId(facesContext));
-
+		externalContext.addRequestParameterMap(
+				DraggableRendererContributor.DRAG_SOURCE_ID, dragsupport
+						.getClientId(facesContext));
+		externalContext.addRequestParameterMap(
+				DropzoneRendererContributor.DROP_TARGET_ID, dropsupport
+						.getClientId(facesContext));
 		dragsupport.decode(facesContext);
 		dropsupport.decode(facesContext);
-	
+
 		MockViewRoot root = (MockViewRoot) facesContext.getViewRoot();
-		Buffer queue = root.getEventsQueue(facesContext, PhaseId.ANY_PHASE);
+		EventsQueue queue = root
+				.getEventsQueue(facesContext, PhaseId.ANY_PHASE);
 		assertNotNull(queue);
-		Object[] events = queue.toArray();
-		for(int i=0;i< events.length;i++)
-		{	
-			boolean found = false;
-			for (Iterator srcIt = eventsSet.iterator(); srcIt.hasNext();) {
-				String src = (String) srcIt.next();
-				found = events[i].toString().contains(src);
-				if (found) {
-					break;
+		while (true) {
+			try {
+				FacesEvent event = queue.remove();
+				boolean found = false;
+				for (Iterator srcIt = eventsSet.iterator(); srcIt.hasNext();) {
+					String src = (String) srcIt.next();
+					found = event.toString().contains(src);
+					if (found) {
+						break;
+					}
 				}
+				assertTrue(found);
+			} catch (NoSuchElementException e) {
+				break;
 			}
-			assertTrue(found);			
 		}
 
 	}
- }
+
+}
+
Modified: branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -39,7 +39,7 @@
 import org.ajax4jsf.resource.image.ImageInfo;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
+import org.ajax4jsf.event.EventsQueue;
 import org.apache.commons.lang.StringUtils;
 import org.richfaces.component.html.HtmlMenuItem;
 import org.richfaces.renderkit.html.images.background.MenuItemBackground;
@@ -319,10 +319,12 @@
         menuItem.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
-        assertEquals(1, events.size());
+        assertFalse(events.isEmpty());
+        events.remove();
+        assertTrue(events.isEmpty());
     }
 
     /**
@@ -338,10 +340,12 @@
         menuItem.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
-        assertEquals(1, events.size());
+        assertFalse(events.isEmpty());
+        events.remove();
+        assertTrue(events.isEmpty());
     }
 
     /**
Modified: branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -31,9 +31,9 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
 import org.apache.commons.lang.StringUtils;
 import org.richfaces.component.html.HtmlPanelBar;
 import org.richfaces.component.html.HtmlPanelBarItem;
@@ -255,12 +255,12 @@
         panelBar.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
-        assertEquals(1, events.size());
 
-        FacesEvent event = (FacesEvent) events.iterator().next();
+        FacesEvent event = (FacesEvent) events.remove();
+        assertTrue(events.isEmpty());
         assertTrue(event instanceof SwitchablePanelSwitchEvent);
         SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
         assertEquals(switchEvent.getValue(), "Swich");
@@ -275,9 +275,10 @@
         panelBar.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
-        assertEquals(0, events.size());
+        FacesEvent event = (FacesEvent) events.remove();
+        assertTrue(events.isEmpty());
     }
 }
Modified: branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -25,9 +25,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlScript;
 import org.richfaces.event.SwitchablePanelSwitchEvent;
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
 import org.apache.commons.lang.StringUtils;
 
 import javax.faces.FacesException;
@@ -331,22 +331,24 @@
         toggleControl.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.APPLY_REQUEST_VALUES);
         assertNotNull(events);
-        assertEquals(2, events.size());
 
-        FacesEvent event = (FacesEvent) events.iterator().next();
+        FacesEvent event = (FacesEvent) events.remove();
         assertTrue(event instanceof SwitchablePanelSwitchEvent);
         SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
         assertEquals(switchEvent.getValue(), "ABYBC");
 
+        events.remove();
+        assertTrue(events.isEmpty());
+
         events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
-        assertEquals(1, events.size());
 
-        event = (FacesEvent) events.iterator().next();
+        event = (FacesEvent) events.remove();
+        assertTrue(events.isEmpty());
 
         assertTrue(event instanceof ActionEvent);
         ActionEvent actionEvent = (ActionEvent) event;
@@ -366,10 +368,10 @@
         togglePanel.decode(facesContext);
 
         MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
-        Buffer events = mockViewRoot.getEventsQueue(facesContext,
+        EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
-        assertEquals(0, events.size());
+        assertTrue(events.isEmpty());
 
         togglePanel.setSwitchType(UITogglePanel.AJAX_METHOD);
         externalContext.getRequestParameterMap().put(
@@ -383,7 +385,7 @@
         events = mockViewRoot.getEventsQueue(facesContext,
                 PhaseId.INVOKE_APPLICATION);
         assertNotNull(events);
-        assertEquals(0, events.size());
+        assertTrue(events.isEmpty());
     }
 
     /**
Modified: branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java
===================================================================
--- branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java	2007-09-27 20:55:15 UTC (rev 3159)
+++ branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java	2007-09-27 22:12:10 UTC (rev 3160)
@@ -29,7 +29,7 @@
 import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
 import org.ajax4jsf.tests.MockMethodBinding;
 import org.ajax4jsf.tests.MockViewRoot;
-import org.apache.commons.collections.Buffer;
+import org.ajax4jsf.event.EventsQueue;
 import org.richfaces.component.UITree;
 import org.richfaces.component.UITreeNode;
 import org.richfaces.event.AjaxSelectedEvent;
@@ -102,14 +102,14 @@
 		MockMethodBinding binding = new MockMethodBinding();
 		treeNode.setNodeSelectListener(binding);
 		
-		Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext);
+		EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext);
 		assertNotNull(events);
-		assertEquals(0, events.size());
+	       assertTrue(events.isEmpty());
 
 		AjaxSelectedEvent event = new AjaxSelectedEvent(treeNode, null);
 		TreeEvents.invokeListenerBindings(treeNode, event, facesContext);
 		
-		assertEquals(1, events.size());
+	        assertFalse(events.isEmpty());
 
 		Object[][] args = binding.getInvocationArgs();
 		assertEquals(1, args.length);
@@ -125,16 +125,16 @@
 		MockMethodBinding binding = new MockMethodBinding();
 		treeNode.setNodeSelectListener(binding);
 		
-		Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext);
+		EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext);
 		assertNotNull(events);
-		assertEquals(0, events.size());
+	        assertTrue(events.isEmpty());
 		assertEquals(0, binding.getInvocationArgs().length);
 
 		AjaxSelectedEvent event = new AjaxSelectedEvent(treeNode, null);
 		TreeEvents.invokeListenerBindings(treeNode, event, facesContext);
 		
 		assertNotNull(events);
-		assertEquals(0, events.size());
+	        assertTrue(events.isEmpty());
 		assertEquals(0, binding.getInvocationArgs().length);
 	}
 	
                                
                         
                        
                                
                                18 years, 1 month
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        JBoss Rich Faces SVN: r3159 - trunk/ui/drag-drop/src/test/java/org/richfaces/component.
                                
                                
                                
                                    
                                        by richfaces-svn-commits@lists.jboss.org
                                    
                                
                                
                                        Author: alexsmirnov
Date: 2007-09-27 16:55:15 -0400 (Thu, 27 Sep 2007)
New Revision: 3159
Modified:
   trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
Log:
fix for http://jira.jboss.org/jira/browse/RF-1004
Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java	2007-09-27 20:54:49 UTC (rev 3158)
+++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java	2007-09-27 20:55:15 UTC (rev 3159)
@@ -1,16 +1,19 @@
 package org.richfaces.component;
- 
+
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIPanel;
 import javax.faces.component.html.HtmlForm;
+import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 import javax.servlet.http.HttpServletResponse;
 
+import org.ajax4jsf.event.EventsQueue;
 import org.ajax4jsf.resource.InternetResource;
 import org.ajax4jsf.resource.InternetResourceBuilder;
 import org.ajax4jsf.resource.ResourceBuilderImpl;
@@ -26,13 +29,13 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlScript;
 
- /**
-  * Unit test for simple Component.
-  */
+/**
+ * Unit test for simple Component.
+ */
 public class DragDropTest extends AbstractAjax4JsfTestCase {
- 
+
 	private UIDndParam dndparam;
- 
+
 	private UIDragIndicator dndindicator;
 
 	private UIDragSupport dragsupport;
@@ -44,7 +47,7 @@
 	private UIComponent form;
 
 	private static final String CSS_FILE_PATH = "org/richfaces/renderkit/html/css/dragIndicator.xcss";
-	
+
 	private static Set javaScripts = new HashSet();
 	static {
 		javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
@@ -53,27 +56,20 @@
 		javaScripts.add("org.ajax4jsf.javascript.DnDScript");
 		javaScripts.add("scripts/events.js");
 		javaScripts.add("scripts/utils.js");
-		javaScripts
-				.add("scripts/simple-draggable.js");
-		javaScripts
-				.add("scripts/simple-dropzone.js");
+		javaScripts.add("scripts/simple-draggable.js");
+		javaScripts.add("scripts/simple-dropzone.js");
 		javaScripts.add("scripts/json/json-mini.js");
-		javaScripts
-				.add("scripts/json/json-dom.js");
-		javaScripts
-				.add("scripts/dnd/dnd-common.js");
-		javaScripts
-				.add("scripts/dnd/dnd-dropzone.js");
-		javaScripts
-				.add("scripts/dnd/dnd-draggable.js");
-		javaScripts
-				.add("scripts/drag-indicator.js");
+		javaScripts.add("scripts/json/json-dom.js");
+		javaScripts.add("scripts/dnd/dnd-common.js");
+		javaScripts.add("scripts/dnd/dnd-dropzone.js");
+		javaScripts.add("scripts/dnd/dnd-draggable.js");
+		javaScripts.add("scripts/drag-indicator.js");
 	}
 	private static Set eventsSet = new HashSet();
 	static {
 		eventsSet.add("org.richfaces.component.html.HtmlDragSupport");
 		eventsSet.add("org.richfaces.component.html.HtmlDropSupport");
-		
+
 	}
 
 	public DragDropTest(String testName) {
@@ -190,50 +186,58 @@
 	}
 
 	public void testDecode() throws Exception {
-		externalContext.addRequestParameterMap(DraggableRendererContributor.DRAG_SOURCE_ID, dragsupport.getClientId(facesContext));
-		externalContext.addRequestParameterMap(DropzoneRendererContributor.DROP_TARGET_ID, dropsupport.getClientId(facesContext));
+		externalContext.addRequestParameterMap(
+				DraggableRendererContributor.DRAG_SOURCE_ID, dragsupport
+						.getClientId(facesContext));
+		externalContext.addRequestParameterMap(
+				DropzoneRendererContributor.DROP_TARGET_ID, dropsupport
+						.getClientId(facesContext));
 
 		dragsupport.decode(facesContext);
 		dropsupport.decode(facesContext);
-	
+
 		MockViewRoot root = (MockViewRoot) facesContext.getViewRoot();
-		Buffer queue = root.getEventsQueue(facesContext, PhaseId.ANY_PHASE);
+		EventsQueue queue = root
+				.getEventsQueue(facesContext, PhaseId.ANY_PHASE);
 		assertNotNull(queue);
-		Object[] events = queue.toArray();
-		for(int i=0;i< events.length;i++)
-		{	
-			boolean found = false;
-			for (Iterator srcIt = eventsSet.iterator(); srcIt.hasNext();) {
-				String src = (String) srcIt.next();
-				found = events[i].toString().contains(src);
-				if (found) {
-					break;
+		while (true) {
+			try {
+				FacesEvent event = queue.remove();
+				boolean found = false;
+				for (Iterator srcIt = eventsSet.iterator(); srcIt.hasNext();) {
+					String src = (String) srcIt.next();
+					found = event.toString().contains(src);
+					if (found) {
+						break;
+					}
 				}
+				assertTrue(found);
+			} catch (NoSuchElementException e) {
+				break;
 			}
-			assertTrue(found);			
 		}
 
 	}
-	
+
 	/**
-     * Test style rendering
-     *
-     * @throws Exception
-     */
-    public void testRenderStyle() throws Exception {
-        HtmlPage page = renderView();
-        assertNotNull(page);
-        List links = page.getDocumentElement().getHtmlElementsByTagName("link");
-        assertEquals(1, links.size());
-        HtmlElement link = (HtmlElement) links.get(0);
-        assertTrue(link.getAttributeValue("href").contains(CSS_FILE_PATH));
-        
-        InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
-    	InternetResource resource = builder.getResource(CSS_FILE_PATH);
-    	assertNotNull(resource);
-    	String uri = "http:" + resource.getUri(facesContext, null);
-    	Page cssFile = webClient.getPage(uri);
-    	assertNotNull(cssFile);
-    	assertTrue(cssFile.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
-    }
- }
+	 * Test style rendering
+	 * 
+	 * @throws Exception
+	 */
+	public void testRenderStyle() throws Exception {
+		HtmlPage page = renderView();
+		assertNotNull(page);
+		List links = page.getDocumentElement().getHtmlElementsByTagName("link");
+		assertEquals(1, links.size());
+		HtmlElement link = (HtmlElement) links.get(0);
+		assertTrue(link.getAttributeValue("href").contains(CSS_FILE_PATH));
+
+		InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+		InternetResource resource = builder.getResource(CSS_FILE_PATH);
+		assertNotNull(resource);
+		String uri = "http:" + resource.getUri(facesContext, null);
+		Page cssFile = webClient.getPage(uri);
+		assertNotNull(cssFile);
+		assertTrue(cssFile.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+	}
+}
                                
                         
                        
                                
                                18 years, 1 month