[richfaces-svn-commits] JBoss Rich Faces SVN: r4767 - in branches/3.1.x/samples/richfaces-demo/src/main: java/org/richfaces/demo and 16 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: maksimkaszynski
Date: 2007-12-12 06:42:57 -0500 (Wed, 12 Dec 2007)
New Revision: 4767

Added:
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
Removed:
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
Modified:
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
   branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java
   branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml
   branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
Log:
Merged demo with trunk

Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -4,13 +4,15 @@
 package org.richfaces.datatablescroller;
 
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
 import org.richfaces.demo.datafilterslider.DemoInventoryItem;
+import org.richfaces.model.ScrollableTableDataModel.SimpleRowKey;
+import org.richfaces.model.selection.SimpleSelection;
 
 /**
  * @author Nick Belaevski - nbelaevski at exadel.com
@@ -18,6 +20,8 @@
  * 
  */
 public class DataTableScrollerBean {
+	private SimpleSelection selection = new SimpleSelection();
+	private ArrayList<DemoInventoryItem> selectedCars = new ArrayList<DemoInventoryItem>(); 
 	private static int DECIMALS = 1;
 	private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_UP;
 
@@ -146,4 +150,32 @@
 			b[i] = (byte)rand('A', 'Z');
 		return new String(b);
 	}
+
+	public SimpleSelection getSelection() {
+		return selection;
+	}
+
+	public void setSelection(SimpleSelection selection) {
+		System.out.println("Setting Started");
+		this.selection = selection;
+		System.out.println("Setting Complete");
+	}
+	
+	public String takeSelection() {
+		getSelectedCars().clear();
+		Iterator<SimpleRowKey> iterator = getSelection().getKeys();
+		while (iterator.hasNext()){
+			SimpleRowKey key = iterator.next();
+			getSelectedCars().add(getAllCars().get(key.intValue()));
+		}
+		return null;
+	}
+
+	public ArrayList<DemoInventoryItem> getSelectedCars() {
+		return selectedCars;
+	}
+
+	public void setSelectedCars(ArrayList<DemoInventoryItem> selectedCars) {
+		this.selectedCars = selectedCars;
+	}
 }

Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,51 +0,0 @@
-package org.richfaces.demo.capitals;
-
-import java.io.Serializable;
-
-public class Capital implements Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1042449580199397136L;
-	private boolean checked=false;
-	private String name;
-	private String state;
-	private String timeZone;
-	
-	private final static String FILE_EXT = ".gif";
-	public Capital() {
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getState() {
-		return state;
-	}
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	private String stateNameToFileName() {
-		return state.replaceAll("\\s", "").toLowerCase();
-	}
-	
-	public String getStateFlag() {
-		return "/images/capitals/" + stateNameToFileName() + FILE_EXT;
-	}
-	
-	public String getTimeZone() {
-		return timeZone;
-	}
-	public void setTimeZone(String timeZone) {
-		this.timeZone = timeZone;
-	}
-	public boolean isChecked() {
-		return checked;
-	}
-	public void setChecked(boolean checked) {
-		this.checked = checked;
-	}
-}

Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java	                        (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,51 @@
+package org.richfaces.demo.capitals;
+
+import java.io.Serializable;
+
+public class Capital implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1042449580199397136L;
+	private boolean checked=false;
+	private String name;
+	private String state;
+	private String timeZone;
+	
+	private final static String FILE_EXT = ".gif";
+	public Capital() {
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	private String stateNameToFileName() {
+		return state.replaceAll("\\s", "").toLowerCase();
+	}
+	
+	public String getStateFlag() {
+		return "/images/capitals/" + stateNameToFileName() + FILE_EXT;
+	}
+	
+	public String getTimeZone() {
+		return timeZone;
+	}
+	public void setTimeZone(String timeZone) {
+		this.timeZone = timeZone;
+	}
+	public boolean isChecked() {
+		return checked;
+	}
+	public void setChecked(boolean checked) {
+		this.checked = checked;
+	}
+}

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,65 +0,0 @@
-package org.richfaces.demo.capitals;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.faces.FacesException;
-
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.xmlrules.DigesterLoader;
-import org.xml.sax.SAXException;
-
-public class CapitalsBean {
-	private ArrayList<Capital> capitals = new ArrayList<Capital>();
-    private String capital = ""; 
-	
-	public List<Capital> autocomplete(Object suggest) {
-        String pref = (String)suggest;
-        ArrayList<Capital> result = new ArrayList<Capital>();
-
-        Iterator<Capital> iterator = getCapitals().iterator();
-        while (iterator.hasNext()) {
-            Capital elem = ((Capital) iterator.next());
-            if ((elem.getName() != null && elem.getName().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
-            {
-                result.add(elem);
-            }
-        }
-        return result;
-    }
-    
-	public CapitalsBean() {
-		URL rulesUrl = getClass().getResource("capitals-rules.xml");
-		Digester digester =	DigesterLoader.createDigester(rulesUrl);
-		digester.push(this);
-		try {
-			digester.parse(getClass().getResourceAsStream("capitals.xml"));
-		} catch (IOException e) {
-			throw new FacesException(e);
-		} catch (SAXException e) {
-			throw new FacesException(e);
-		}
-
-	}
-	
-	public String addCapital(Capital capital) {
-		capitals.add(capital);
-		return null;
-	}
-	
-	public ArrayList<Capital> getCapitals() {
-		return capitals;
-	}
-
-	public String getCapital() {
-		return capital;
-	}
-
-	public void setCapital(String capital) {
-		this.capital = capital;
-	}
-	
-}

Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java	                        (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,65 @@
+package org.richfaces.demo.capitals;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.FacesException;
+
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.xmlrules.DigesterLoader;
+import org.xml.sax.SAXException;
+
+public class CapitalsBean {
+	private ArrayList<Capital> capitals = new ArrayList<Capital>();
+    private String capital = ""; 
+	
+	public List<Capital> autocomplete(Object suggest) {
+        String pref = (String)suggest;
+        ArrayList<Capital> result = new ArrayList<Capital>();
+
+        Iterator<Capital> iterator = getCapitals().iterator();
+        while (iterator.hasNext()) {
+            Capital elem = ((Capital) iterator.next());
+            if ((elem.getName() != null && elem.getName().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
+            {
+                result.add(elem);
+            }
+        }
+        return result;
+    }
+    
+	public CapitalsBean() {
+		URL rulesUrl = getClass().getResource("capitals-rules.xml");
+		Digester digester =	DigesterLoader.createDigester(rulesUrl);
+		digester.push(this);
+		try {
+			digester.parse(getClass().getResourceAsStream("capitals.xml"));
+		} catch (IOException e) {
+			throw new FacesException(e);
+		} catch (SAXException e) {
+			throw new FacesException(e);
+		}
+
+	}
+	
+	public String addCapital(Capital capital) {
+		capitals.add(capital);
+		return null;
+	}
+	
+	public ArrayList<Capital> getCapitals() {
+		return capitals;
+	}
+
+	public String getCapital() {
+		return capital;
+	}
+
+	public void setCapital(String capital) {
+		this.capital = capital;
+	}
+	
+}

Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -100,7 +100,7 @@
 	
 	public String getTagInfoLocation() {
 		int pos = tldDocLocation.indexOf("tlddoc");
-		if (pos >= 0) {
+		if (pos > 0) {
 			return tldDocLocation.substring(pos);
 		}
 		return tldDocLocation;

Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -28,7 +28,7 @@
 	}
 	public String updateCurrent() {
 		FacesContext context=FacesContext.getCurrentInstance();
-		setCurrent(context.getExternalContext().getRequestParameterMap().get("current"));
+		setCurrent((String)context.getExternalContext().getRequestParameterMap().get("current"));
 		System.out.println("fake called.");
 		return null;
 	}

Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java	2007-12-12 11:42:57 UTC (rev 4767)
@@ -13,11 +13,6 @@
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private String property;
-
-    private ArrayList cities;
-
-    private ArrayList data;
     private ArrayList tokens;
 
     private String rows;
@@ -30,12 +25,10 @@
     private boolean check;
     private String shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH);
     private String border = "1";
-    private String width = "200";
+    private String width = "250";
     private String height = "150";
     private String shadowOpacity = "4";
 
-    private static final String [] cit = {"Abba", "Abbeville", "Acworth", "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", "Albany", "Allenhurst", "Alma", "Alpharetta", "Alston", "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn", "Athens", "Athens-Clarke County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson"};
-
     public SuggestionBox() {
         this.rows = "0";
         this.first = "0";
@@ -45,57 +38,8 @@
         this.frequency = "0";
         this.rules = "none";
 
-        setCities(getAllData());
     }
 
-    public List autocomplete(Object suggest) {
-        String pref = (String)suggest;
-        ArrayList result = new ArrayList();
-
-        Iterator iterator = getAllData().iterator();
-        while (iterator.hasNext()) {
-            Data elem = (Data) iterator.next();
-            if ((elem != null && elem.getText().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
-            {
-                result.add(elem);
-            }
-        }
-        return result;
-    }
-
-    public ArrayList getCities() {
-        return cities;
-    }
-
-    public void setCities(ArrayList cities) {
-        this.cities = cities;
-    }
-
-    public ArrayList getAllData() {
-        ArrayList result = new ArrayList();
-        for (int i = 0; i < cit.length; i++) {
-            Data data = new Data(cit[i], String.valueOf(i + 1));
-            result.add(data);
-        }
-        return result;
-    }
-
-    public ArrayList getData() {
-        return data;
-    }
-
-    public void setData(ArrayList data) {
-        this.data = data;
-    }
-
-    public String getProperty() {
-        return property;
-    }
-
-    public void setProperty(String property) {
-        this.property = property;
-    }
-
     public String getCellpadding() {
         return cellpadding;
     }

Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	<!DOCTYPE digester-rules SYSTEM "digester-rules.dtd">
--->
-
-<digester-rules>
-	<pattern value="*/capital">
-		<object-create-rule	classname="org.richfaces.demo.capitals.Capital" />
-		<bean-property-setter-rule pattern="name" propertyname="name"/>	
-		<bean-property-setter-rule pattern="state" propertyname="state"/>	
-		<bean-property-setter-rule pattern="timeZone" propertyname="timeZone"/>	
-		<set-next-rule methodname="addCapital"/>
-	</pattern>
-</digester-rules>
\ No newline at end of file

Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml	                        (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+	<!DOCTYPE digester-rules SYSTEM "digester-rules.dtd">
+-->
+
+<digester-rules>
+	<pattern value="*/capital">
+		<object-create-rule	classname="org.richfaces.demo.capitals.Capital" />
+		<bean-property-setter-rule pattern="name" propertyname="name"/>	
+		<bean-property-setter-rule pattern="state" propertyname="state"/>	
+		<bean-property-setter-rule pattern="timeZone" propertyname="timeZone"/>	
+		<set-next-rule methodname="addCapital"/>
+	</pattern>
+</digester-rules>
\ No newline at end of file

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<capitals>
-	<capital>
-		<state>Alabama</state>
-		<name>Montgomery</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Alaska</state>
-		<name>Juneau</name>
-		<timeZone>GMT-9</timeZone>
-	</capital>
-	<capital>
-		<state>Arizona</state>
-		<name>Phoenix</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-	<capital>
-		<state>Arkansas</state>
-		<name>Little Rock</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>California</state>
-		<name>Sacramento</name>
-		<timeZone>GMT-8</timeZone>
-	</capital>
-	<capital>
-		<state>Colorado</state>
-		<name>Denver</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-	<capital>
-		<state>Connecticut</state>
-		<name>Hartford</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Delaware</state>
-		<name>Dover</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Florida</state>
-		<name>Tallahassee</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Georgia</state>
-		<name>Atlanta</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Hawaii</state>
-		<name>Honolulu</name>
-		<timeZone>GMT-10</timeZone>
-	</capital>
-	<capital>
-		<state>Idaho</state>
-		<name>Boise</name>
-		<timeZone>GMT-8</timeZone>
-	</capital>
-	<capital>
-		<state>Illinois</state>
-		<name>Springfield</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Indiana</state>
-		<name>Indianapolis</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Iowa</state>
-		<name>Des Moines</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Kansas</state>
-		<name>Topeka</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Kentucky</state>
-		<name>Frankfort</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Louisiana</state>
-		<name>Baton Rouge</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Maine</state>
-		<name>Augusta</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Maryland</state>
-		<name>Annapolis</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Massachusetts</state>
-		<name>Boston</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Michigan</state>
-		<name>Lansing</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Minnesota</state>
-		<name>St. Paul</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Mississippi</state>
-		<name>Jackson</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Missouri</state>
-		<name>Jefferson City</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Montana</state>
-		<name>Helena</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-	<capital>
-		<state>Nebraska</state>
-		<name>Lincoln</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Nevada</state>
-		<name>Carson City</name>
-		<timeZone>GMT-8</timeZone>
-	</capital>
-	<capital>
-		<state>New Hampshire</state>
-		<name>Concord</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>New Jersey</state>
-		<name>Trenton</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>New Mexico</state>
-		<name>Santa Fe</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-	<capital>
-		<state>New York</state>
-		<name>Albany</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>North Carolina</state>
-		<name>Raleigh</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>North Dakota</state>
-		<name>Bismarck</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Ohio</state>
-		<name>Columbus</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Oklahoma</state>
-		<name>Oklahoma City</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Oregon</state>
-		<name>Salem</name>
-		<timeZone>GMT-8</timeZone>
-	</capital>
-	<capital>
-		<state>Pennsylvania</state>
-		<name>Harrisburg</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Rhode Island</state>
-		<name>Providence</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>South Carolina</state>
-		<name>Columbia</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>South Dakota</state>
-		<name>Pierre</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Tennessee</state>
-		<name>Nashville</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Texas</state>
-		<name>Austin</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Utah</state>
-		<name>Salt Lake City</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-	<capital>
-		<state>Vermont</state>
-		<name>Montpelier</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Virginia</state>
-		<name>Richmond</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Washington</state>
-		<name>Olympia</name>
-		<timeZone>GMT-8</timeZone>
-	</capital>
-	<capital>
-		<state>West Virginia</state>
-		<name>Charleston</name>
-		<timeZone>GMT-5</timeZone>
-	</capital>
-	<capital>
-		<state>Wisconsin</state>
-		<name>Madison</name>
-		<timeZone>GMT-6</timeZone>
-	</capital>
-	<capital>
-		<state>Wyoming</state>
-		<name>Cheyenne</name>
-		<timeZone>GMT-7</timeZone>
-	</capital>
-</capitals>
\ No newline at end of file

Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml	                        (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<capitals>
+	<capital>
+		<state>Alabama</state>
+		<name>Montgomery</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Alaska</state>
+		<name>Juneau</name>
+		<timeZone>GMT-9</timeZone>
+	</capital>
+	<capital>
+		<state>Arizona</state>
+		<name>Phoenix</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+	<capital>
+		<state>Arkansas</state>
+		<name>Little Rock</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>California</state>
+		<name>Sacramento</name>
+		<timeZone>GMT-8</timeZone>
+	</capital>
+	<capital>
+		<state>Colorado</state>
+		<name>Denver</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+	<capital>
+		<state>Connecticut</state>
+		<name>Hartford</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Delaware</state>
+		<name>Dover</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Florida</state>
+		<name>Tallahassee</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Georgia</state>
+		<name>Atlanta</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Hawaii</state>
+		<name>Honolulu</name>
+		<timeZone>GMT-10</timeZone>
+	</capital>
+	<capital>
+		<state>Idaho</state>
+		<name>Boise</name>
+		<timeZone>GMT-8</timeZone>
+	</capital>
+	<capital>
+		<state>Illinois</state>
+		<name>Springfield</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Indiana</state>
+		<name>Indianapolis</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Iowa</state>
+		<name>Des Moines</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Kansas</state>
+		<name>Topeka</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Kentucky</state>
+		<name>Frankfort</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Louisiana</state>
+		<name>Baton Rouge</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Maine</state>
+		<name>Augusta</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Maryland</state>
+		<name>Annapolis</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Massachusetts</state>
+		<name>Boston</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Michigan</state>
+		<name>Lansing</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Minnesota</state>
+		<name>St. Paul</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Mississippi</state>
+		<name>Jackson</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Missouri</state>
+		<name>Jefferson City</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Montana</state>
+		<name>Helena</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+	<capital>
+		<state>Nebraska</state>
+		<name>Lincoln</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Nevada</state>
+		<name>Carson City</name>
+		<timeZone>GMT-8</timeZone>
+	</capital>
+	<capital>
+		<state>New Hampshire</state>
+		<name>Concord</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>New Jersey</state>
+		<name>Trenton</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>New Mexico</state>
+		<name>Santa Fe</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+	<capital>
+		<state>New York</state>
+		<name>Albany</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>North Carolina</state>
+		<name>Raleigh</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>North Dakota</state>
+		<name>Bismarck</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Ohio</state>
+		<name>Columbus</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Oklahoma</state>
+		<name>Oklahoma City</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Oregon</state>
+		<name>Salem</name>
+		<timeZone>GMT-8</timeZone>
+	</capital>
+	<capital>
+		<state>Pennsylvania</state>
+		<name>Harrisburg</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Rhode Island</state>
+		<name>Providence</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>South Carolina</state>
+		<name>Columbia</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>South Dakota</state>
+		<name>Pierre</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Tennessee</state>
+		<name>Nashville</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Texas</state>
+		<name>Austin</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Utah</state>
+		<name>Salt Lake City</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+	<capital>
+		<state>Vermont</state>
+		<name>Montpelier</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Virginia</state>
+		<name>Richmond</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Washington</state>
+		<name>Olympia</name>
+		<timeZone>GMT-8</timeZone>
+	</capital>
+	<capital>
+		<state>West Virginia</state>
+		<name>Charleston</name>
+		<timeZone>GMT-5</timeZone>
+	</capital>
+	<capital>
+		<state>Wisconsin</state>
+		<name>Madison</name>
+		<timeZone>GMT-6</timeZone>
+	</capital>
+	<capital>
+		<state>Wyoming</state>
+		<name>Cheyenne</name>
+		<timeZone>GMT-7</timeZone>
+	</capital>
+</capitals>
\ No newline at end of file

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd	2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-        "Digester" component of the Jakarta Commons Subproject
-        DTD for the definition of Digester rules in XML.
-        $Id: digester-rules.dtd,v 1.8 2003/03/27 18:54:45 rdonkin Exp $
--->
-
-<!-- This document type defines an XML format for defining Digester rules.
-     Digester is a framework for pattern-matching-based parsing of XML into
-     Java objects. See http://jakarta.apache.org/commons/digester.html.  -->
-
-<!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule | call-param-rule |
-                   factory-create-rule | object-create-rule |
-                   set-properties-rule | set-property-rule | set-top-rule |
-                   set-next-rule" >
-
-<!-- digester-rules is the root element. -->
-<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | factory-create-rule | object-create-rule | set-properties-rule | set-property-rule | set-top-rule | set-next-rule )*>
-
-
-<!-- <pattern> defines a matching pattern, or part of a matching pattern. Any
-     rule nested in a pattern element prepends its parent's to its pattern.
-     Patterns may be recursively nested.
-     Example:
-       <pattern value="foo">
-          <pattern value="bar">
-            <object-create-rule pattern="baz" classname="Fubar" />
-          </pattern>
-       </pattern>
-
-     The above sample fragment defines an ObjectCreateRule associated
-     with the pattern "foo/bar/baz".
-
-  Note that the use of pattern elements is optional; an alternative is for
-  each rule element to contain a 'pattern' attribute.   -->
-<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule |
-                   factory-create-rule | object-create-rule |
-                   set-properties-rule | set-property-rule | set-top-rule |
-                   set-next-rule )*>
-<!ATTLIST pattern
-    value CDATA #REQUIRED>
-
-
-<!--
-  <include> allows one set of digester rules to be included inside
-  another. The 'path' attribute contains the URI of the document to
-  include. Inclusion behaves as if the included rules document is
-  'macro-expanded' within the outer document.
-  Programmatically initialized rules can be included as well, via the
-  'class' attribute. The 'class' attribute should contain the name
-  of a class that implements
-  org.apache.commons.digester.xmlrules.DigesterRulesSource.
--->
-<!ELEMENT include EMPTY>
-<!ATTLIST include
-    path  CDATA #IMPLIED
-    class CDATA #IMPLIED>
-
-
-<!-- Each 'rule' element below corresponds to a concrete subclass
-     of org.apache.framework.digester.Rule.
-     Each 'rule' element has an optional 'pattern' attribute, which
-     defines the pattern for that rule instance. If the rule element
-     is nested inside one or more <pattern> elements, those patterns
-     will be prepended to the pattern specified in the rule's 'pattern'
-     attribute. -->
-
-<!-- Bean Property Setter Rule -->
-<!ELEMENT bean-property-setter-rule EMPTY>
-<!ATTLIST bean-property-setter-rule
-    pattern      CDATA #IMPLIED
-    propertyname CDATA #IMPLIED>
-
-<!-- CallMethodRule -->
-<!ELEMENT call-method-rule EMPTY>
-<!ATTLIST call-method-rule
-    pattern    CDATA #IMPLIED
-    methodname CDATA #REQUIRED
-    paramcount CDATA #IMPLIED
-    paramtypes CDATA #IMPLIED>
-
-<!-- 
-    CallParamRule 
-    attrname - set param from attribute value (cannot be combined with from-stack)
-    from-stack - set param from stack (cannot be combined with attrname)
-    -->
-<!ELEMENT call-param-rule EMPTY>
-<!ATTLIST call-param-rule
-    pattern  CDATA #IMPLIED
-    paramnumber CDATA #REQUIRED
-    attrname CDATA #IMPLIED
-    from-stack CDATA #IMPLIED>
-
-<!-- 
-    FactoryCreateRule 
-    
-    ignore-exceptions - if this attribute is (ignore case) 'true' then any exceptions
-                        thrown by the object create rule will be ignore.
-                        This will allow processing to continue.
-    -->
-<!ELEMENT factory-create-rule EMPTY>
-<!ATTLIST factory-create-rule
-    pattern   CDATA #IMPLIED
-    classname CDATA #REQUIRED
-    attrname  CDATA #IMPLIED
-    ignore-exceptions  CDATA #IMPLIED> 
-
-<!-- ObjectCreateRule -->
-<!ELEMENT object-create-rule EMPTY>
-<!ATTLIST object-create-rule
-    pattern   CDATA #IMPLIED
-    classname CDATA #REQUIRED
-    attrname  CDATA #IMPLIED>
-
-<!-- SetPropertiesRule -->
-<!ELEMENT set-properties-rule (alias)*>
-<!ATTLIST factory-create-rule
-    pattern   CDATA #IMPLIED>
-
-<!-- An alias is a custom attribute->property name mapping -->
-<!ELEMENT alias EMPTY>
-<!ATTLIST alias
- attr-name CDATA #REQUIRED
- prop-name CDATA #IMPLIED>
-
-<!-- SetPropertyRule -->
-<!ELEMENT set-property-rule EMPTY>
-<!ATTLIST set-property-rule
-    pattern   CDATA #IMPLIED
-    name      CDATA #IMPLIED
-    value     CDATA #IMPLIED>
-
-<!-- SetTopRule -->
-<!ELEMENT set-top-rule EMPTY>
-<!ATTLIST set-top-rule
-    pattern    CDATA #IMPLIED
-    methodname CDATA #REQUIRED
-    paramtype  CDATA #IMPLIED>
-
-<!-- SetNextRule -->
-<!ELEMENT set-next-rule EMPTY>
-<!ATTLIST set-next-rule
-    pattern    CDATA #IMPLIED
-    methodname CDATA #REQUIRED
-    paramtype  CDATA #IMPLIED>

Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd	                        (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd	2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+        "Digester" component of the Jakarta Commons Subproject
+        DTD for the definition of Digester rules in XML.
+        $Id: digester-rules.dtd,v 1.8 2003/03/27 18:54:45 rdonkin Exp $
+-->
+
+<!-- This document type defines an XML format for defining Digester rules.
+     Digester is a framework for pattern-matching-based parsing of XML into
+     Java objects. See http://jakarta.apache.org/commons/digester.html.  -->
+
+<!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule | call-param-rule |
+                   factory-create-rule | object-create-rule |
+                   set-properties-rule | set-property-rule | set-top-rule |
+                   set-next-rule" >
+
+<!-- digester-rules is the root element. -->
+<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | factory-create-rule | object-create-rule | set-properties-rule | set-property-rule | set-top-rule | set-next-rule )*>
+
+
+<!-- <pattern> defines a matching pattern, or part of a matching pattern. Any
+     rule nested in a pattern element prepends its parent's to its pattern.
+     Patterns may be recursively nested.
+     Example:
+       <pattern value="foo">
+          <pattern value="bar">
+            <object-create-rule pattern="baz" classname="Fubar" />
+          </pattern>
+       </pattern>
+
+     The above sample fragment defines an ObjectCreateRule associated
+     with the pattern "foo/bar/baz".
+
+  Note that the use of pattern elements is optional; an alternative is for
+  each rule element to contain a 'pattern' attribute.   -->
+<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule |
+                   factory-create-rule | object-create-rule |
+                   set-properties-rule | set-property-rule | set-top-rule |
+                   set-next-rule )*>
+<!ATTLIST pattern
+    value CDATA #REQUIRED>
+
+
+<!--
+  <include> allows one set of digester rules to be included inside
+  another. The 'path' attribute contains the URI of the document to
+  include. Inclusion behaves as if the included rules document is
+  'macro-expanded' within the outer document.
+  Programmatically initialized rules can be included as well, via the
+  'class' attribute. The 'class' attribute should contain the name
+  of a class that implements
+  org.apache.commons.digester.xmlrules.DigesterRulesSource.
+-->
+<!ELEMENT include EMPTY>
+<!ATTLIST include
+    path  CDATA #IMPLIED
+    class CDATA #IMPLIED>
+
+
+<!-- Each 'rule' element below corresponds to a concrete subclass
+     of org.apache.framework.digester.Rule.
+     Each 'rule' element has an optional 'pattern' attribute, which
+     defines the pattern for that rule instance. If the rule element
+     is nested inside one or more <pattern> elements, those patterns
+     will be prepended to the pattern specified in the rule's 'pattern'
+     attribute. -->
+
+<!-- Bean Property Setter Rule -->
+<!ELEMENT bean-property-setter-rule EMPTY>
+<!ATTLIST bean-property-setter-rule
+    pattern      CDATA #IMPLIED
+    propertyname CDATA #IMPLIED>
+
+<!-- CallMethodRule -->
+<!ELEMENT call-method-rule EMPTY>
+<!ATTLIST call-method-rule
+    pattern    CDATA #IMPLIED
+    methodname CDATA #REQUIRED
+    paramcount CDATA #IMPLIED
+    paramtypes CDATA #IMPLIED>
+
+<!-- 
+    CallParamRule 
+    attrname - set param from attribute value (cannot be combined with from-stack)
+    from-stack - set param from stack (cannot be combined with attrname)
+    -->
+<!ELEMENT call-param-rule EMPTY>
+<!ATTLIST call-param-rule
+    pattern  CDATA #IMPLIED
+    paramnumber CDATA #REQUIRED
+    attrname CDATA #IMPLIED
+    from-stack CDATA #IMPLIED>
+
+<!-- 
+    FactoryCreateRule 
+    
+    ignore-exceptions - if this attribute is (ignore case) 'true' then any exceptions
+                        thrown by the object create rule will be ignore.
+                        This will allow processing to continue.
+    -->
+<!ELEMENT factory-create-rule EMPTY>
+<!ATTLIST factory-create-rule
+    pattern   CDATA #IMPLIED
+    classname CDATA #REQUIRED
+    attrname  CDATA #IMPLIED
+    ignore-exceptions  CDATA #IMPLIED> 
+
+<!-- ObjectCreateRule -->
+<!ELEMENT object-create-rule EMPTY>
+<!ATTLIST object-create-rule
+    pattern   CDATA #IMPLIED
+    classname CDATA #REQUIRED
+    attrname  CDATA #IMPLIED>
+
+<!-- SetPropertiesRule -->
+<!ELEMENT set-properties-rule (alias)*>
+<!ATTLIST factory-create-rule
+    pattern   CDATA #IMPLIED>
+
+<!-- An alias is a custom attribute->property name mapping -->
+<!ELEMENT alias EMPTY>
+<!ATTLIST alias
+ attr-name CDATA #REQUIRED
+ prop-name CDATA #IMPLIED>
+
+<!-- SetPropertyRule -->
+<!ELEMENT set-property-rule EMPTY>
+<!ATTLIST set-property-rule
+    pattern   CDATA #IMPLIED
+    name      CDATA #IMPLIED
+    value     CDATA #IMPLIED>
+
+<!-- SetTopRule -->
+<!ELEMENT set-top-rule EMPTY>
+<!ATTLIST set-top-rule
+    pattern    CDATA #IMPLIED
+    methodname CDATA #REQUIRED
+    paramtype  CDATA #IMPLIED>
+
+<!-- SetNextRule -->
+<!ELEMENT set-next-rule EMPTY>
+<!ATTLIST set-next-rule
+    pattern    CDATA #IMPLIED
+    methodname CDATA #REQUIRED
+    paramtype  CDATA #IMPLIED>

Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties	2007-12-12 11:42:57 UTC (rev 4767)
@@ -67,8 +67,11 @@
 log=                ajaxMisc,             Log,                  /images/ico_common.gif,                 /images/cn_Log.gif,                      RichFacesComponentsLibrary.html#log,                                                jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html,                  jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html,                           /richfaces/log.jsf
 page=               ajaxMisc,             Ajax Page,            /images/ico_common.gif,                 /images/cn_AjaxPage.gif,                 RichFacesComponentsLibrary.html#page,                                               jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html,                 jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html,                        /richfaces/page.jsf
 portlet=            ajaxMisc,             Ajax Portlet,         /images/ico_common.gif,                 /images/cn_AjaxPortlet.gif,              RichFacesComponentsLibrary.html#portlet,                                            jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html,              jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html,                           /richfaces/portlet.jsf
+<<<<<<< .working
 effect=             richMisc,             Effect,               /images/ico_common.gif,                 /images/cn_Effect.gif,                   RichFacesComponentsLibrary.html#effect,                                             jbossrichfaces/freezone/docs/tlddoc/rich/effect.html,             jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html,                     /richfaces/effect.jsf
 contextMenu=		richMenu,             Context Menu,         /images/ico_dropDownMenu.gif,           /images/cn_contextMenu.gif,             RichFacesComponentsLibrary.html\#contextMenu,                                        jbossrichfaces/freezone/docs/tlddoc/rich/contextMenu.html,        jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIContextMenu.html,                /richfaces/contextMenu.jsf
 componentControl=	richMisc,            Component Control,    /images/ico_common.gif,           /images/cn_componentControl.gif,         RichFacesComponentsLibrary.html\#componentControl,                                 jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html,        jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomponentControl.html,                /richfaces/componentControl.jsf
 orderingList=		richSelect,          Ordering List,    /images/ico_DataTable.gif,           /images/cn_orderingList.gif,         RichFacesComponentsLibrary.html\#orderingList,                                 jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html,        jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html,                /richfaces/orderingList.jsf
-listShuttle=		richSelect,          List Shuttle,    /images/ico_DataTable.gif,           /images/cn_listShuttle.gif,         RichFacesComponentsLibrary.html\#listShuttle,                                 jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html,        jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html,                /richfaces/listShuttle.jsf
\ No newline at end of file
+listShuttle=		richSelect,          List Shuttle,    /images/ico_DataTable.gif,           /images/cn_listShuttle.gif,         RichFacesComponentsLibrary.html\#listShuttle,                                 jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html,        jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html,                /richfaces/listShuttle.jsf=======
+effect=             richMisc,             Effect,               /images/ico_common.gif,                 /images/cn_Effect.gif,                   RichFacesComponentsLibrary.html#effect,                                             jbossrichfaces/freezone/docs/tlddoc/rich/effect.html,             jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html,                     /richfaces/effect.jsf
+>>>>>>> .merge-right.r4766

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -17,10 +17,15 @@
   </managed-property>
  </managed-bean>
  <managed-bean>
+  <managed-bean-name>capitalsBean</managed-bean-name>
+  <managed-bean-class>org.richfaces.demo.capitals.CapitalsBean</managed-bean-class>
+  <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
   <managed-bean-name>ddmenu</managed-bean-name>
   <managed-bean-class>org.richfaces.demo.ddmenu.Menu</managed-bean-class>
   <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
+ </managed-bean> 
  <managed-bean>
   <managed-bean-name>calendarBean</managed-bean-name>
   <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class>

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -42,7 +42,16 @@
  <context-param>
   <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
   <param-value>NEKO</param-value>
- </context-param>
+ </context-param>
+ 	<context-param>
+		<param-name>org.richfaces.LoadStyleStrategy</param-name>
+		<param-value>ALL</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.richfaces.LoadScriptStrategy</param-name>
+		<param-value>ALL</param-value>
+	</context-param>
+ 
  <filter>
   <display-name>Ajax4jsf Filter</display-name>
   <filter-name>ajax4jsf</filter-name>

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif)
===================================================================
(Binary files differ)

Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
===================================================================
(Binary files differ)

Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif)
===================================================================
(Binary files differ)

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -2,7 +2,7 @@
 <h:form id="form1">
  	....
  	<a4j:commandButton value="Usual Way" reRender="infoBlock, infoBlock2" />
- 	<a4j:commandButton value="Shortcut" reRender=":infoBlockl,:sv:infoBlock2" />
+ 	<a4j:commandButton value="Shortcut" reRender=":infoBlock,:sv:infoBlock2" />
 	.....
 </h:form>
 <h:panelGrid id="infoBlock">

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -82,7 +82,7 @@
 			</rich:panel>	
 			<p>
 			<b>limitToList</b> attribute allows to dismiss the behavior of the a4j:outputPanel ajaxRendered
-			attribute. limitToList = "false" means to update only the area(s) that mentioned in the
+			attribute. limitToList = "true" means to update only the area(s) that mentioned in the
 			reRender attribute explicitly. All output panels with ajaxRendered="true" will be ignored.
 			</p>
 			<h1 class="hsample">Queue and Traffic Flood Protection</h1>

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -12,7 +12,7 @@
 				<ui:include src="/richfaces/dataLists/usage.xhtml"/>
 			</rich:tab>			
 			<ui:include src="/templates/include/tagInfo.xhtml">
-				<ui:param name="path" value="rich/dataLists"/>
+				<ui:param name="path" value="rich/dataList"/>
 			</ui:include>		
 		</rich:tabPanel>
 	</ui:define>

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -10,7 +10,8 @@
 			<rich:spacer height="30" />
 			<rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" 
 				width="700px" id="carList" rows="40" columnClasses="col"
-				value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single">
+				value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"
+				selection="#{dataTableScrollerBean.selection}">
 
 				<rich:column id="make">
 					<f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet>
@@ -36,10 +37,40 @@
 					<f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet>
 					<h:outputText value="#{category.stock}" />
 				</rich:column>
-
-
-
-			</rich:scrollableDataTable>
+			</rich:scrollableDataTable>
+			<rich:spacer height="20px"/>
+			<a4j:commandButton value="Show Current Selection" reRender="table" 
+				action="#{dataTableScrollerBean.takeSelection}" 
+				oncomplete="javascript:Richfaces.showModalPanel('panel');"/>
 		</h:form>
-
+		<rich:modalPanel id="panel" autosized="true">
+				<f:facet name="header">
+					<h:outputText value="Selected Rows"/>
+				</f:facet>
+				<f:facet name="controls">
+					<span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span>
+				</f:facet>
+			<rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table">
+				<rich:column>
+					<f:facet name="header"><h:outputText value="Make" /></f:facet>
+					<h:outputText value="#{sel.make}" />
+				</rich:column>
+				<rich:column id="model">
+					<f:facet name="header"><h:outputText value="Model" /></f:facet>
+					<h:outputText value="#{sel.model}" />
+				</rich:column>
+				<rich:column id="price">
+					<f:facet name="header"><h:outputText value="Price" /></f:facet>
+					<h:outputText value="#{sel.price}" />
+				</rich:column>
+				<rich:column id="mileage">
+					<f:facet name="header"><h:outputText value="Mileage" /></f:facet>
+					<h:outputText value="#{sel.mileage}" />
+				</rich:column>
+				<rich:column id="stock">
+					<f:facet name="header"><h:outputText value="Stock" /></f:facet>
+					<h:outputText value="#{sel.stock}" />
+				</rich:column>
+			</rich:dataTable>
+		</rich:modalPanel>
 </ui:composition>
\ No newline at end of file

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -6,47 +6,41 @@
       xmlns:rich="http://richfaces.org/rich">
 
 	<h:form id="suggestionbox_form">
-
-		<h:outputText
-			value="Simple richfaces Suggestion Box test web application."
-			style="font: 18px;font-weight: bold;" />
-		<br />
-		<br />
-
-		<h:panelGrid columns="3" border="0" style="border: 1px solid black;">
-			<f:verbatim>Suggestion Box will suggest you  town names if it's started with the "a" or
-       "A" letter</f:verbatim>
-
-			<f:facet name="header">
-				<f:verbatim>Input With Suggestion Feature</f:verbatim>
-			</f:facet>
-
-
-			<f:verbatim>&#160;</f:verbatim>
-
-			<h:inputText value="#{suggestionBox.property}" id="text" />
+
+			<p>
+				Suggestion Box will suggest you states capitals names. Comma and space could be used as suggestions separators."
+			</p>
+			<h:inputText value="#{capitalsBean.capital}" id="text" />
 			<rich:suggestionbox id="suggestionBoxId" for="text" tokens=",["
 				rules="#{suggestionBox.rules}"
-				suggestionAction="#{suggestionBox.autocomplete}" var="result"
-				fetchValue="#{result.text}" rows="#{suggestionBox.intRows}"
+				suggestionAction="#{capitalsBean.autocomplete}" var="result"
+				fetchValue="#{result.name}" rows="#{suggestionBox.intRows}"
 				first="#{suggestionBox.intFirst}"
 				minChars="#{suggestionBox.minchars}"
 				shadowOpacity="#{suggestionBox.shadowOpacity}"
 				border="#{suggestionBox.border}" width="#{suggestionBox.width}"
 				height="#{suggestionBox.height}"
 				shadowDepth="#{suggestionBox.shadowDepth}"
-				cellpadding="#{suggestionBox.cellpadding}">
-				<h:column>
-					<h:outputText value="#{result.text}" />
+				cellpadding="#{suggestionBox.cellpadding}"
+				nothingLabel="No capitals found" columnClasses="center">
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="123"></h:outputText>
+					</f:facet>
+					<h:graphicImage value="#{result.stateFlag}" />
 				</h:column>
+				<h:column>
+					<h:outputText value="#{result.name}" />
+				</h:column>
+				<h:column>
+					<h:outputText value="#{result.state}" style="font-style:italic"/>
+				</h:column>
 			</rich:suggestionbox>
-		</h:panelGrid>
+
+		<rich:spacer height="30px"/>
 
-		<br />
-		<br />
-
-		<h:panelGrid columns="2" border="0" style="border: 1px solid black;">
-
+		<h:panelGrid columns="2" border="0" >
+ 
 			<h:outputText value="Border" />
 
 			<rich:inputNumberSlider minValue="1" maxValue="5"

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -12,7 +12,7 @@
 				<ui:include src="/richfaces/suggestionBox/usage.xhtml"/>
 			</rich:tab>			
 			<ui:include src="/templates/include/tagInfo.xhtml">
-				<ui:param name="path" value="rich/suggestionBox"/>
+				<ui:param name="path" value="rich/suggestionbox"/>
 			</ui:include>		
 		</rich:tabPanel>
 	</ui:define>

Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml	2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml	2007-12-12 11:42:57 UTC (rev 4767)
@@ -114,6 +114,12 @@
 										<f:param value="DEFAULT" name="s"/>
 									</h:outputLink>
 								</td>
+								<td>
+									<h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+										Null
+										<f:param value="NULL" name="s"/>
+									</h:outputLink>
+								</td>
 								<td class="control">
 									<rich:toggleControl for="skin_chooser" value="&#171; less" />
 								</td>