From richfaces-svn-commits at lists.jboss.org Mon May  9 17:11:14 2011
Content-Type: multipart/mixed; boundary="===============7936587835426458952=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r22480 - in
 modules/tests/metamer/trunk/application/src:
 main/java/org/richfaces/tests/metamer/validation/groups and 2 other
 directories.
Date: Mon, 09 May 2011 17:11:13 -0400
Message-ID: <201105092111.p49LBDeu015408@svn01.web.mwc.hst.phx2.redhat.com>

--===============7936587835426458952==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jjamrich
Date: 2011-05-09 17:11:13 -0400 (Mon, 09 May 2011)
New Revision: 22480

Added:
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/validation/groups/ValidableGroupNumericInputs.java
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/validation/groups/ValidationGroupAllComponents.java
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/validation/groups/ValidationGroupBooleanInputs.java
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/validation/groups/ValidationGroupNumericInputs.java
   modules/tests/metamer/trunk/application/src/main/webapp/components/richG=
raphValidator/all.xhtml
Modified:
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/bean/rich/RichGraphValidatorBean.java
   modules/tests/metamer/trunk/application/src/main/webapp/components/richG=
raphValidator/list.xhtml
   modules/tests/metamer/trunk/application/src/test/java/org/richfaces/test=
s/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java
Log:
Add some rich components into metamer within graphValidator

Add some components + new validation groups to test rich:graphValidator
behavior.

Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac=
es/tests/metamer/bean/rich/RichGraphValidatorBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichGraphValidatorBean.java	2011-05-06 18:27:42 UTC (r=
ev 22479)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichGraphValidatorBean.java	2011-05-09 21:11:13 UTC (r=
ev 22480)
@@ -22,20 +22,23 @@
 package org.richfaces.tests.metamer.bean.rich;
 =

 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 =

 import javax.annotation.PostConstruct;
 import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ViewScoped;
 import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
 import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Size;
-import javax.validation.groups.Default;
+import javax.validation.constraints.NotNull;
 =

+import org.hibernate.validator.constraints.NotEmpty;
 import org.richfaces.component.UIGraphValidator;
 import org.richfaces.tests.metamer.Attributes;
-import org.richfaces.tests.metamer.validation.groups.ValidationGroup1;
-import org.richfaces.tests.metamer.validation.groups.ValidationGroup2;
+import org.richfaces.tests.metamer.validation.groups.ValidationGroupBoolea=
nInputs;
+import org.richfaces.tests.metamer.validation.groups.ValidationGroupNumeri=
cInputs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 =

@@ -45,20 +48,62 @@
  * @author <a href=3D"mailto:jjamrich(a)redhat.com">Jan Jamrich</a>
  * @version $Revision$
  */
-(a)ManagedBean(name=3D"richGraphValidatorBean")
+(a)ManagedBean(name =3D "richGraphValidatorBean")
 @ViewScoped
 public class RichGraphValidatorBean implements Serializable, Cloneable {
     =

+    /** Valid value of numeric inputs */
+    public static final int REQUIRED_INT_VALUE =3D 10;
+    =

     /** Generated UID */
     private static final long serialVersionUID =3D -960575870621302059L;
+    =

     private static Logger logger;
+    private final String smile =3D ":-)";
     private Attributes attributes;
     =

-    @Size(min =3D 5, max =3D 15, message =3D "Wrong size for password")
-    private String password;
-    @Size(min =3D 5, max =3D 15, message =3D "Wrong size for password")
-    private String passwordConfirm;
+    private List<SelectItem> selectItems;
     =

+    @NotNull
+    @NotEmpty
+    private String autocompleteInput =3D smile;    =

+    @NotNull
+    @NotEmpty
+    private String inplaceSelect =3D smile;    =

+    @NotNull
+    @NotEmpty
+    private String inplaceInput =3D smile;    =

+    @NotNull
+    @NotEmpty
+    private String select =3D smile;    =

+    private Integer inputNumberSlider =3D new Integer(REQUIRED_INT_VALUE);
+    private Integer inputNumberSpinner =3D new Integer(REQUIRED_INT_VALUE);
+    @NotNull
+    @NotEmpty
+    private String inputText =3D smile;    =

+    @NotNull
+    @NotEmpty
+    private String inputSecret =3D smile;
+    @NotNull
+    @NotEmpty
+    private String inputTextarea =3D smile;
+    private Boolean selectBooleanCheckbox =3D Boolean.TRUE;
+    @NotEmpty
+    private List<SelectItem> selectManyCheckbox =3D createSelectItems();
+    @NotNull
+    @NotEmpty
+    private String selectOneListbox =3D smile;
+    @NotEmpty
+    private List<SelectItem> selectManyListbox =3D createSelectItems();
+    @NotNull
+    @NotEmpty
+    private String selectOneMenu =3D smile;
+    @NotEmpty
+    private List<SelectItem> selectManyMenu =3D createSelectItems();
+    @NotNull
+    @NotEmpty
+    private String selectOneRadio =3D smile;
+    =

     @PostConstruct
     public void init(){
         logger =3D LoggerFactory.getLogger(getClass());
@@ -69,25 +114,60 @@
         attributes.setAttribute("type", "org.richfaces.BeanValidator");
     }
     =

-    @AssertTrue(message =3D "Different passwords entered! [Default Group]")
-    public boolean isPasswordsEquals() {
-        return password.equals(passwordConfirm);
+    @AssertTrue(message =3D "One of following inputs doesn't contain smile=
 or numeric value 10!")
+    public boolean isAllInputsCorrect(){
+        =

+        return autocompleteInput.contains(smile)
+            && inplaceSelect.contains(smile)
+            && inplaceInput.contains(smile)
+            && select.contains(smile)
+            && inputNumberSlider.equals(new Integer(10))
+            && inputNumberSpinner.equals(new Integer(10))
+            && inputText.contains(smile)
+            && inputSecret.contains(smile)
+            && inputTextarea.contains(smile)
+            && selectBooleanCheckbox.booleanValue()
+            && !selectManyCheckbox.isEmpty()
+            && selectOneListbox.contains(smile)
+            && !selectManyListbox.isEmpty()
+            && selectOneMenu.contains(smile)
+            && !selectManyMenu.isEmpty()
+            && selectOneRadio.contains(smile);
     }
     =

-    @AssertTrue(message =3D "Different passwords entered! [G1]", groups=3D=
{ValidationGroup1.class})
-    public boolean isRovnakeHesla() {
-        return password.equals(passwordConfirm);
+    @AssertTrue(message =3D "One of following inputs doesn't contain smile=
",
+                groups =3D {ValidationGroupNumericInputs.class})
+    public boolean isAllTextInputsCorrect() {
+        return inputNumberSlider.equals(new Integer(10))
+            && inputNumberSpinner.equals(new Integer(10));            =

     }
     =

-    @AssertTrue(message =3D "Different passwords entered! [G2 + Default Gr=
oup]", groups =3D {ValidationGroup2.class,Default.class})
-    public boolean isPokusUspesny() {
-        return password.equals(passwordConfirm);
+    @AssertTrue(message =3D "One of following inputs doesn't contain smile=
",
+        groups =3D {ValidationGroupBooleanInputs.class})
+    public boolean isAllBooleanInputsCorrect() {
+        return inputNumberSlider.equals(new Integer(10))
+            && inputNumberSpinner.equals(new Integer(10));            =

     }
     =

-    public void storeNewPassword() {
+    public void anotherActionOnAllComponents() {
         FacesContext.getCurrentInstance().addMessage(null,
-            new FacesMessage(FacesMessage.SEVERITY_INFO, "Succesfully chan=
ged!", "Succesfully changed!"));
+            new FacesMessage(FacesMessage.SEVERITY_INFO, "Action sucessful=
ly done!", "Action sucessfully done!"));
     }
+    =

+    private List<SelectItem> createSelectItems() {
+        List<SelectItem> result =3D new ArrayList<SelectItem>();
+        result.add(new SelectItem("a", "Abcd"));
+        result.add(new SelectItem("b", "Bcde"));
+        result.add(new SelectItem("c", "Cdef"));
+        result.add(new SelectItem("d", "Defg"));
+        result.add(new SelectItem(smile, smile));
+        =

+        return result;
+    }
+    =

+    public Class<?> getValidationGroups() {
+        return ValidationGroupNumericInputs.class;
+    }
 =

     public Attributes getAttributes() {
         return attributes;
@@ -97,19 +177,142 @@
         this.attributes =3D attributes;
     }
 =

-    public String getPassword() {
-        return password;
+    public String getAutocompleteInput() {
+        return autocompleteInput;
     }
 =

-    public void setPassword(String password) {
-        this.password =3D password;
+    public void setAutocompleteInput(String autocompleteInput) {
+        this.autocompleteInput =3D autocompleteInput;
     }
 =

-    public String getPasswordConfirm() {
-        return passwordConfirm;
+    public String getInplaceSelect() {
+        return inplaceSelect;
     }
 =

-    public void setPasswordConfirm(String passwordConfirm) {
-        this.passwordConfirm =3D passwordConfirm;
+    public void setInplaceSelect(String inplaceSelect) {
+        this.inplaceSelect =3D inplaceSelect;
     }
+
+    public String getInplaceInput() {
+        return inplaceInput;
+    }
+
+    public void setInplaceInput(String inplaceInput) {
+        this.inplaceInput =3D inplaceInput;
+    }
+
+    public String getSelect() {
+        return select;
+    }
+
+    public void setSelect(String select) {
+        this.select =3D select;
+    }
+
+    public List<SelectItem> getSelectItems() {
+        if (selectItems =3D=3D null ) {
+            selectItems =3D createSelectItems();
+        }
+        return selectItems;
+    }
+
+    public void setSelectItems(List<SelectItem> selectItems) {
+        this.selectItems =3D selectItems;
+    }
+
+    public Integer getInputNumberSlider() {
+        return inputNumberSlider;
+    }
+
+    public void setInputNumberSlider(Integer inputNumberSlider) {
+        this.inputNumberSlider =3D inputNumberSlider;
+    }
+
+    public Integer getInputNumberSpinner() {
+        return inputNumberSpinner;
+    }
+
+    public void setInputNumberSpinner(Integer inputNumberSpinner) {
+        this.inputNumberSpinner =3D inputNumberSpinner;
+    }
+
+    public String getInputText() {
+        return inputText;
+    }
+
+    public void setInputText(String inputText) {
+        this.inputText =3D inputText;
+    }
+
+    public String getInputSecret() {
+        return inputSecret;
+    }
+
+    public void setInputSecret(String inputSecret) {
+        this.inputSecret =3D inputSecret;
+    }
+
+    public String getInputTextarea() {
+        return inputTextarea;
+    }
+
+    public void setInputTextarea(String inputTextarea) {
+        this.inputTextarea =3D inputTextarea;
+    }
+
+    public Boolean getSelectBooleanCheckbox() {
+        return selectBooleanCheckbox;
+    }
+
+    public void setSelectBooleanCheckbox(Boolean selectBooleanCheckbox) {
+        this.selectBooleanCheckbox =3D selectBooleanCheckbox;
+    }
+
+    public List<SelectItem> getSelectManyCheckbox() {
+        return selectManyCheckbox;
+    }
+
+    public void setSelectManyCheckbox(List<SelectItem> selectManyCheckbox)=
 {
+        this.selectManyCheckbox =3D selectManyCheckbox;
+    }
+
+    public String getSelectOneListbox() {
+        return selectOneListbox;
+    }
+
+    public void setSelectOneListbox(String selectOneListbox) {
+        this.selectOneListbox =3D selectOneListbox;
+    }
+
+    public List<SelectItem> getSelectManyListbox() {
+        return selectManyListbox;
+    }
+
+    public void setSelectManyListbox(List<SelectItem> selectManyListbox) {
+        this.selectManyListbox =3D selectManyListbox;
+    }
+
+    public String getSelectOneMenu() {
+        return selectOneMenu;
+    }
+
+    public void setSelectOneMenu(String selectOneMenu) {
+        this.selectOneMenu =3D selectOneMenu;
+    }
+
+    public List<SelectItem> getSelectManyMenu() {
+        return selectManyMenu;
+    }
+
+    public void setSelectManyMenu(List<SelectItem> selectManyMenu) {
+        this.selectManyMenu =3D selectManyMenu;
+    }
+
+    public String getSelectOneRadio() {
+        return selectOneRadio;
+    }
+
+    public void setSelectOneRadio(String selectOneRadio) {
+        this.selectOneRadio =3D selectOneRadio;
+    }
 }

Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/=
tests/metamer/validation/groups/ValidableGroupNumericInputs.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidableGroupNumericInputs.java	             =
           (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidableGroupNumericInputs.java	2011-05-09 21=
:11:13 UTC (rev 22480)
@@ -0,0 +1,32 @@
+/*************************************************************************=
******
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *************************************************************************=
******/
+package org.richfaces.tests.metamer.validation.groups;
+
+/**
+ * Validation Group for Numeric Inputs
+ *
+ * @author <a href=3D"mailto:jjamrich(a)redhat.com">Jan Jamrich</a>
+ * @version $Revision$
+ */
+public interface ValidableGroupNumericInputs {
+
+}

Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/=
tests/metamer/validation/groups/ValidationGroupAllComponents.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupAllComponents.java	            =
            (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupAllComponents.java	2011-05-09 2=
1:11:13 UTC (rev 22480)
@@ -0,0 +1,32 @@
+/*************************************************************************=
******
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *************************************************************************=
******/
+package org.richfaces.tests.metamer.validation.groups;
+
+/**
+ * Validation group for page with many rich components =

+ *
+ * @author <a href=3D"mailto:jjamrich(a)redhat.com">Jan Jamrich</a>
+ * @version $Revision$
+ */
+public interface ValidationGroupAllComponents {
+
+}

Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/=
tests/metamer/validation/groups/ValidationGroupBooleanInputs.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupBooleanInputs.java	            =
            (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupBooleanInputs.java	2011-05-09 2=
1:11:13 UTC (rev 22480)
@@ -0,0 +1,32 @@
+/*************************************************************************=
******
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *************************************************************************=
******/
+package org.richfaces.tests.metamer.validation.groups;
+
+/**
+ * Validation Group for Boolean Inputs
+ *
+ * @author <a href=3D"mailto:jjamrich(a)redhat.com">Jan Jamrich</a>
+ * @version $Revision$
+ */
+public interface ValidationGroupBooleanInputs {
+
+}

Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/=
tests/metamer/validation/groups/ValidationGroupNumericInputs.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupNumericInputs.java	            =
            (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/validation/groups/ValidationGroupNumericInputs.java	2011-05-09 2=
1:11:13 UTC (rev 22480)
@@ -0,0 +1,32 @@
+/*************************************************************************=
******
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *************************************************************************=
******/
+package org.richfaces.tests.metamer.validation.groups;
+
+/**
+ * Implementation test
+ *
+ * @author <a href=3D"mailto:jjamrich(a)redhat.com">Jan Jamrich</a>
+ * @version $Revision$
+ */
+public class ValidationGroupNumericInputs implements ValidableGroupNumeric=
Inputs {
+
+}

Added: modules/tests/metamer/trunk/application/src/main/webapp/components/r=
ichGraphValidator/all.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
GraphValidator/all.xhtml	                        (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
GraphValidator/all.xhtml	2011-05-09 21:11:13 UTC (rev 22480)
@@ -0,0 +1,185 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns=3D"http://www.w3.org/1999/xhtml"
+	xmlns:h=3D"http://java.sun.com/jsf/html"	=

+	xmlns:f=3D"http://java.sun.com/jsf/core"
+	xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+	xmlns:a4j=3D"http://richfaces.org/a4j"
+	xmlns:rich=3D"http://richfaces.org/rich"
+	xmlns:metamer=3D"http://java.sun.com/jsf/composite/metamer">
+
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+    -->
+
+<ui:composition template=3D"/templates/template.xhtml">
+
+	<ui:define name=3D"view">
+		<f:metadata>
+			<f:viewParam name=3D"templates" value=3D"#{templateBean.templates}">
+				<f:converter converterId=3D"templatesListConverter" />
+			</f:viewParam>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name=3D"head">
+		<style type=3D"text/css">
+						=

+		</style>
+	</ui:define>
+
+	<ui:define name=3D"component">
+		<script type=3D"text/javascript">
+        </script>
+
+		<h:form>					=

+			<ui:fragment rendered=3D"#{richGraphValidatorBean.attributes['summary']=
.value=3D=3Dnull =

+					|| richGraphValidatorBean.attributes['summary'].value=3D=3D''}" >
+				<rich:graphValidator id=3D"gv1"
+									 value=3D"#{richGraphValidatorBean}"
+									 groups=3D"#{richGraphValidatorBean.attributes['groups'].value}"
+									 type=3D"#{richGraphValidatorBean.attributes['type'].value}"
+									 rendered=3D"#{richGraphValidatorBean.attributes['rendered'].valu=
e}" >										=

+					<rich:panel header=3D"Many rich components within rich:graphValidator=
" style=3D"width:500px">
+						<rich:messages globalOnly=3D"true" />
+						<h:panelGrid columns=3D"3">
+							<h:outputText for=3D"inplaceSelect" value=3D"Inplace Select" />
+							<rich:inplaceSelect id=3D"inplaceSelect" value=3D"#{richGraphValida=
torBean.inplaceSelect}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</rich:inplaceSelect>
+							<rich:message for=3D"inplaceSelect" />
+							=

+							<h:outputText for=3D"inplaceInput" value=3D"Inplace Input" />
+							<rich:inplaceInput id=3D"inplaceInput" value=3D"#{richGraphValidato=
rBean.inplaceInput}" />
+							<rich:message for=3D"inplaceInput" />
+							=

+							<h:outputText for=3D"select" value=3D"Select" />
+							<rich:select id=3D"select" value=3D"#{richGraphValidatorBean.select=
}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</rich:select>
+							<rich:message for=3D"select" />
+							=

+							<h:outputText for=3D"inputNumberSlider" value=3D"Input Number Slide=
r" />
+							<rich:inputNumberSlider id=3D"inputNumberSlider" value=3D"#{richGra=
phValidatorBean.inputNumberSlider}" />
+							<rich:message for=3D"inputNumberSlider" />
+							=

+							<h:outputText for=3D"inputNumberSpinner" value=3D"Input Number Spin=
ner" />
+							<rich:inputNumberSpinner id=3D"inputNumberSpinner" value=3D"#{richG=
raphValidatorBean.inputNumberSpinner}" />
+							<rich:message for=3D"inputNumberSpinner" />
+														=

+							<h:outputText for=3D"autocomplete" value=3D"Autocomplete" />
+							<rich:autocomplete id=3D"autocomplete" value=3D"#{richGraphValidato=
rBean.autocompleteInput}" />
+							<rich:message for=3D"autocomplete" />
+							=

+							<h:outputText for=3D"inputText" value=3D"Input Text" />
+							<h:inputText id=3D"inputText" value=3D"#{richGraphValidatorBean.inp=
utText}" />
+							<rich:message for=3D"inputText" />
+							=

+							<h:outputText for=3D"inputSecret" value=3D"Input Secret" />
+							<h:inputSecret id=3D"inputSecret" value=3D"#{richGraphValidatorBean=
.inputSecret}" />
+							<rich:message for=3D"inputSecret" />
+							=

+							<h:outputText for=3D"inputTextarea" value=3D"Input Text Area" />
+							<h:inputTextarea id=3D"inputTextarea" value=3D"#{richGraphValidator=
Bean.inputTextarea}" />
+							<rich:message for=3D"inputTextarea" />
+							=

+							<h:outputText for=3D"selectBooleanCheckbox" value=3D"Select Boolean=
 Checkbox" />
+							<h:selectBooleanCheckbox id=3D"selectBooleanCheckbox" value=3D"#{ri=
chGraphValidatorBean.selectBooleanCheckbox}" />
+							<rich:message for=3D"selectBooleanCheckbox" />
+							=

+							<h:outputText for=3D"selectManyCheckbox" value=3D"Select Many Check=
box" />
+							<h:selectManyCheckbox id=3D"selectManyCheckbox" =

+                                                  value=3D"#{richGraphVali=
datorBean.selectManyCheckbox}" >
+                            	<f:selectItems value=3D"#{richGraphValidatorB=
ean.selectItems}" />
+							</h:selectManyCheckbox>
+							<rich:message for=3D"selectManyCheckbox" />
+							=

+							<h:outputText for=3D"selectOneListbox" value=3D"Select One Listbox"=
 />
+							<h:selectOneListbox id=3D"selectOneListbox" value=3D"#{richGraphVal=
idatorBean.selectOneListbox}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</h:selectOneListbox>
+							<rich:message for=3D"selectOneListbox" />
+							=

+							<h:outputText for=3D"selectManyListbox" value=3D"Select Many Listbo=
x" />
+							<h:selectManyListbox id=3D"selectManyListbox" value=3D"#{richGraphV=
alidatorBean.selectManyListbox}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</h:selectManyListbox>
+							<rich:message for=3D"selectManyListbox" />
+							=

+							<h:outputText for=3D"selectOneMenu" value=3D"Select One Menu" />
+							<h:selectOneMenu id=3D"selectOneMenu" value=3D"#{richGraphValidator=
Bean.selectOneMenu}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</h:selectOneMenu>
+							<rich:message for=3D"selectOneMenu" />
+							=

+							<h:outputText for=3D"selectManyMenu" value=3D"Select Many Menu" />
+							<h:selectManyMenu id=3D"selectManyMenu" value=3D"#{richGraphValidat=
orBean.selectManyMenu}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</h:selectManyMenu>
+							<rich:message for=3D"selectManyMenu" />
+							=

+							<h:outputText for=3D"selectOneRadio" value=3D"Select One Radio" />
+							<h:selectOneRadio id=3D"selectOneRadio" value=3D"#{richGraphValidat=
orBean.selectOneRadio}" >
+								<f:selectItems value=3D"#{richGraphValidatorBean.selectItems}" />
+							</h:selectOneRadio>
+							<rich:message for=3D"selectOneRadio" />							=

+							=

+						</h:panelGrid>
+						<a4j:commandButton value=3D"Apply changes"
+							action=3D"#{richGraphValidatorBean.anotherActionOnAllComponents}" />
+					</rich:panel>
+				</rich:graphValidator>
+			</ui:fragment>
+			=

+			<ui:fragment rendered=3D"#{richGraphValidatorBean.attributes['summary']=
.value!=3Dnull =

+									&amp;&amp; richGraphValidatorBean.attributes['summary'].value!=3D=
''}" >
+				<rich:graphValidator id=3D"gv2"									 =

+									 value=3D"#{richGraphValidatorBean}"
+									 groups=3D"#{richGraphValidatorBean.attributes['groups'].value}"
+									 rendered=3D"#{richGraphValidatorBean.attributes['rendered'].valu=
e}"
+									 summary=3D"#{richGraphValidatorBean.attributes['summary'].value}"
+									 type=3D"#{richGraphValidatorBean.attributes['type'].value}" >
+					<rich:panel header=3D"Change password" style=3D"width:500px">
+						<rich:messages for=3D"gv2" />
+						<rich:messages globalOnly=3D"true" />
+						<h:panelGrid columns=3D"3">
+							=

+						</h:panelGrid>
+						<a4j:commandButton value=3D"Store changes"
+							action=3D"#{richGraphValidatorBean.anotherActionOnAllComponents}" />
+					</rich:panel>
+				</rich:graphValidator>
+			</ui:fragment>
+			=

+		</h:form>
+
+		<br />
+		<rich:messages id=3D"msgs" value=3D"#{richGraphValidatorBean}" />
+
+	</ui:define>
+
+	<ui:define name=3D"outOfTemplateAfter">
+		<metamer:attributes value=3D"#{richGraphValidatorBean.attributes}"
+			id=3D"attributes" />
+	</ui:define>
+	=

+</ui:composition>
+</html>
\ No newline at end of file

Modified: modules/tests/metamer/trunk/application/src/main/webapp/component=
s/richGraphValidator/list.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
GraphValidator/list.xhtml	2011-05-06 18:27:42 UTC (rev 22479)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
GraphValidator/list.xhtml	2011-05-09 21:11:13 UTC (rev 22480)
@@ -31,8 +31,8 @@
 =

         <ui:define name=3D"links">
 =

-            <metamer:testPageLink id=3D"jsr303" outcome=3D"jsr303" value=
=3D"JSR-303 Bean Validation">
-                Page containing input with JSR-303 validator within <b>ric=
h:graphValidator</b>
+            <metamer:testPageLink id=3D"all" outcome=3D"all" value=3D"Rich=
 components within graphValidator">
+                Page containing many different rich components within <b>r=
ich:graphValidator</b>
             </metamer:testPageLink>
 =

         </ui:define>

Modified: modules/tests/metamer/trunk/application/src/test/java/org/richfac=
es/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tes=
ts/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java	2011-05-=
06 18:27:42 UTC (rev 22479)
+++ modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tes=
ts/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java	2011-05-=
09 21:11:13 UTC (rev 22480)
@@ -51,10 +51,10 @@
  */
 public class TestRichTreeModelRecursiveAdaptorBeanSerialization {
 =

+    PrintStream sysout;
+    =

     private Set<Integer> notEquals =3D new TreeSet<Integer>();
 =

-    PrintStream sysout;
-
     @BeforeClass
     public void redirectOut() {
         sysout =3D System.out;


--===============7936587835426458952==--