Author: ppitonak(a)redhat.com Date: 2010-12-16 08:54:50 -0500 (Thu, 16 Dec 2010) New Revision: 20610 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java Log: * scope of beans changed to view Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -19,16 +19,15 @@ * 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.bean; import java.io.Serializable; import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import org.richfaces.component.UIAjaxLog; +import javax.faces.bean.ViewScoped; +import org.richfaces.component.UIAjaxLog; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +39,7 @@ * @version $Revision$ */ @ManagedBean(name = "a4jLogBean") -@SessionScoped +@ViewScoped public class A4JLogBean implements Serializable { private static final long serialVersionUID = -1L; @@ -57,9 +56,9 @@ logger.debug("initializing bean " + getClass().getName()); name = "John"; - + attributes = Attributes.getComponentAttributesFromClass(UIAjaxLog.class, getClass()); - + attributes.setAttribute("rendered", true); attributes.setAttribute("level", "debug"); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -19,7 +19,6 @@ * 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.bean; import java.awt.Color; @@ -34,10 +33,10 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import javax.imageio.ImageIO; -import org.richfaces.component.UIMediaOutput; +import org.richfaces.component.UIMediaOutput; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +48,7 @@ * @version $Revision$ */ @ManagedBean(name = "a4jMediaOutputBean") -@SessionScoped +@ViewScoped public class A4JMediaOutputBean implements Serializable { private static final long serialVersionUID = -1L; @@ -65,7 +64,7 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getComponentAttributesFromClass(UIMediaOutput.class, getClass()); - + attributes.setAttribute("session", true); attributes.setAttribute("rendered", true); attributes.remove("createContent"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -25,9 +25,9 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; + import org.richfaces.component.UIOutputPanel; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ * @version $Revision$ */ @ManagedBean(name = "a4jOutputPanelBean") -@SessionScoped +@ViewScoped public class A4JOutputPanelBean implements Serializable { private static final long serialVersionUID = 4814439475400649809L; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -19,16 +19,15 @@ * 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.bean; import java.io.Serializable; import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import org.ajax4jsf.component.UIActionParameter; +import javax.faces.bean.ViewScoped; +import org.ajax4jsf.component.UIActionParameter; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,14 +39,12 @@ * @version $Revision$ */ @ManagedBean(name = "a4jParamBean") -@SessionScoped +@ViewScoped public class A4JParamBean implements Serializable { private static final long serialVersionUID = -23993426776944L; private static Logger logger; private Attributes attributes; - private int width; - private int height; private String parameter; /** @@ -59,7 +56,7 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getComponentAttributesFromClass(UIActionParameter.class, getClass()); - + attributes.setAttribute("name", "param"); attributes.setAttribute("noEscape", true); attributes.setAttribute("value", "screen.width"); @@ -96,5 +93,4 @@ parameter = null; return null; } - } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -19,21 +19,17 @@ * 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.bean; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; - import java.io.Serializable; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + @ManagedBean(name = "mediaData") -@SessionScoped +@ViewScoped public class MediaData implements Serializable { - /** - * - */ private static final long serialVersionUID = 1L; int height = 120; int width = 300; @@ -42,10 +38,9 @@ String text; public MediaData() { - setText("RichFaces 4.0"); - setColor(1000); - setScale(2); - System.out.println("MediaData instantiated"); + text = "RichFaces 4.0"; + color = 1000; + scale = 2; } public Integer getColor() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -28,7 +28,7 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedProperty; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import org.richfaces.component.UICollapsibleSubTable; import org.richfaces.tests.metamer.Attributes; @@ -44,7 +44,7 @@ * @version $Revision$ */ @ManagedBean(name="richSubTableBean") -@SessionScoped +@ViewScoped public class RichCollapsibleSubTableBean implements Serializable { private static final long serialVersionUID = -1L; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2010-12-16 13:44:29 UTC (rev 20609) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2010-12-16 13:54:50 UTC (rev 20610) @@ -28,7 +28,7 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedProperty; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.ViewScoped; import org.richfaces.component.UICollapsibleSubTableToggleControl; import org.richfaces.tests.metamer.Attributes; @@ -44,7 +44,7 @@ * @version $Revision$ */ @ManagedBean(name="richSubTableTogglerBean") -@SessionScoped +@ViewScoped public class RichCollapsibleSubTableTogglerlBean implements Serializable { private static final long serialVersionUID = -1L;