Author: ilya_shaikovsky Date: 2009-08-24 10:34:56 -0400 (Mon, 24 Aug 2009) New Revision: 15278 Modified: root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/UserBean.java root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml root/examples/trunk/richfaces-demo/src/main/webapp/templates/main.xhtml Log: continue rf-demo Modified: root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/UserBean.java =================================================================== --- root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/UserBean.java 2009-08-24 14:17:30 UTC (rev 15277) +++ root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/common/UserBean.java 2009-08-24 14:34:56 UTC (rev 15278) @@ -1,14 +1,14 @@ package org.richfaces.demo.common; import javax.faces.bean.ManagedBean; +import javax.faces.bean.RequestScoped; import javax.faces.bean.SessionScoped; @ManagedBean(name = "userBean") -@SessionScoped +@RequestScoped public class UserBean { - private String name=""; - private java.lang.Integer screenWidth; - private java.lang.Integer screenHeight; + private String name=""; + private String password=""; private String job; private String address; private String city; @@ -40,22 +40,6 @@ this.name = name; } - public java.lang.Integer getScreenWidth() { - return screenWidth; - } - - public void setScreenWidth(java.lang.Integer screenWidth) { - this.screenWidth = screenWidth; - } - - public java.lang.Integer getScreenHeight() { - return screenHeight; - } - - public void setScreenHeight(java.lang.Integer screenHeight) { - this.screenHeight = screenHeight; - } - public String nameItJohn() { setName("John"); return null; @@ -105,4 +89,12 @@ this.age = age; } + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + } Modified: root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java =================================================================== --- root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2009-08-24 14:17:30 UTC (rev 15277) +++ root/examples/trunk/richfaces-demo/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2009-08-24 14:34:56 UTC (rev 15278) @@ -64,7 +64,7 @@ loader = getClass().getClassLoader(); } - InputStream stream = loader.getResourceAsStream("org/richfaces/demo/mediaoutput/text.swf"); + InputStream stream = loader.getResourceAsStream("org/richfaces/demo/mediaOutput/text.swf"); if (stream != null) { try { copy(stream, out); Modified: root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml 2009-08-24 14:17:30 UTC (rev 15277) +++ root/examples/trunk/richfaces-demo/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml 2009-08-24 14:34:56 UTC (rev 15278) @@ -6,9 +6,8 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> - - - <p>SWF Movie:</p> + <script src="#{facesContext.externalContext.requestContextPath}/script/swfobject.js" type="text/javascript"/> + <p>SWF Movie:</p> <a4j:outputPanel id="flashPanelDynamic"> <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" session="true" @@ -21,10 +20,10 @@ </a4j:outputPanel> <script type="text/javascript"> - var flashvars = {}; - var params = {}; - var attributes = {}; - swfobject.embedSWF('swfLink').href, $('myFlashContent')", "200", "200", "9.0.0", false, flashvars, params, attributes); + var flashvars = {}; + var params = {}; + var attributes = {}; + swfobject.embedSWF(document.getElementById('page:swfLink').href, document.getElementById('myFlashContent'), "200", "200", "9.0.0", false, flashvars, params, attributes); </script> </a4j:outputPanel> Modified: root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml 2009-08-24 14:17:30 UTC (rev 15277) +++ root/examples/trunk/richfaces-demo/src/main/webapp/templates/includes/navigation.xhtml 2009-08-24 14:34:56 UTC (rev 15278) @@ -17,6 +17,8 @@ value="#{facesContext.externalContext.requestContextPath}/richfaces/push.jsf">a4j:push</h:outputLink> <h:outputLink value="#{facesContext.externalContext.requestContextPath}/richfaces/status.jsf">a4j:status</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/outputPanel.jsf">a4j:outputPanel</h:outputLink> </h:panelGrid> </rich:panel> </ui:composition> Modified: root/examples/trunk/richfaces-demo/src/main/webapp/templates/main.xhtml =================================================================== --- root/examples/trunk/richfaces-demo/src/main/webapp/templates/main.xhtml 2009-08-24 14:17:30 UTC (rev 15277) +++ root/examples/trunk/richfaces-demo/src/main/webapp/templates/main.xhtml 2009-08-24 14:34:56 UTC (rev 15278) @@ -1,33 +1,26 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<h:head> - <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/CSS/yuiLayouts/reset-fonts-grids.css"/> - <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/CSS/yuiLayouts/grids.css"/> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> +<h:head> </h:head> <h:body> -<div id="doc2" class="yui-t2"> <!-- change class to change preset --> - <div id="hd"> - <center>RichFaces 4.0 Demo</center> - </div> - <div id="bd"> - <div class="yui-b"> - <ui:include src="/templates/includes/navigation.xhtml" /> - </div> - <div id="yui-main"> - <div class="yui-b"> - <ui:insert name="body"> - Body content missed - </ui:insert> - </div> - </div> - </div> - <div id="ft"> - <i><center>Footer</center> </i> - </div> - </div> -</h:body> + <ui:composition> + <rich:page id="page"> + <f:facet name="header"> + <h1>Welcome to RichFaces demo!</h1> + </f:facet> + <f:facet name="sidebar"> + <ui:include src="/templates/includes/navigation.xhtml" /> + </f:facet> + <ui:insert name="body"> + Body content missed + </ui:insert> + <f:facet name="footer"> + footer + </f:facet> + </rich:page> + </ui:composition> +</h:body> </html> \ No newline at end of file