[richfaces-svn-commits] JBoss Rich Faces SVN: r18673 - in trunk: archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp and 3 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Mon Aug 16 13:23:24 EDT 2010


Author: Alex.Kolonitsky
Date: 2010-08-16 13:23:23 -0400 (Mon, 16 Aug 2010)
New Revision: 18673

Added:
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java
Removed:
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/TogglePanelBean.java
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/examples/
Modified:
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml
   trunk/ui/dist/richfaces-components-ui/pom.xml
Log:
RF-8947 RichFaces SimpleApp Archetype is out of sync with project

Copied: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java (from rev 17781, root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java)
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java	                        (rev 0)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java	2010-08-16 17:23:23 UTC (rev 18673)
@@ -0,0 +1,27 @@
+package org.richfaces;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+import java.io.Serializable;
+
+public class RichBean implements Serializable {
+
+    private static final long serialVersionUID = -2403138958014741653L;
+    private Logger logger;
+    private String name;
+
+    public RichBean() {
+        logger = LoggerFactory.getLogger(RichBean.class);
+        logger.info("post construct: initialize");
+        name = "John";
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

Deleted: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/TogglePanelBean.java
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/TogglePanelBean.java	2010-08-16 15:57:29 UTC (rev 18672)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/TogglePanelBean.java	2010-08-16 17:23:23 UTC (rev 18673)
@@ -1,32 +0,0 @@
-package org.richfaces;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-import java.io.Serializable;
-
-public class TogglePanelBean implements Serializable {
-
-    private static final long serialVersionUID = -2403138958014741653L;
-    
-    private static final Logger LOGGER = LoggerFactory.getLogger(TogglePanelBean.class);
-    
-    private String name;
-
-    public TogglePanelBean() {
-        LOGGER.info("post construct: initialize");
-        name = "John";
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void itemChangeActionListener() {
-        LOGGER.info("TogglePanelBean.itemChangeActionListener");
-    }
-}

Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml	2010-08-16 15:57:29 UTC (rev 18672)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml	2010-08-16 17:23:23 UTC (rev 18673)
@@ -3,38 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
 
     <managed-bean>
-        <managed-bean-name>togglePanelBean</managed-bean-name>
-        <managed-bean-class>org.richfaces.TogglePanelBean</managed-bean-class>
+        <managed-bean-name>richBean</managed-bean-name>
+        <managed-bean-class>org.richfaces.RichBean</managed-bean-class>
         <managed-bean-scope>view</managed-bean-scope>
     </managed-bean>
-
-    <navigation-rule>
-        <!-- Examples -->
-        <navigation-case>
-            <from-outcome>togglePanel</from-outcome>
-            <to-view-id>/examples/togglePanel.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>togglePanel/server</from-outcome>
-            <to-view-id>/examples/togglePanel-server.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>togglePanel/ajax</from-outcome>
-            <to-view-id>/examples/togglePanel-ajax.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>togglePanel/client</from-outcome>
-            <to-view-id>/examples/togglePanel-client.xhtml</to-view-id>
-        </navigation-case>
-
-        <!-- QUnit -->
-        <navigation-case>
-            <from-outcome>qunit/togglePanel</from-outcome>
-            <to-view-id>/qunit/togglePanel.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>qunit/togglePanelItem</from-outcome>
-            <to-view-id>/qunit/togglePanelItem.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
 </faces-config>

Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2010-08-16 15:57:29 UTC (rev 18672)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/index.xhtml	2010-08-16 17:23:23 UTC (rev 18673)
@@ -1,9 +1,9 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"
-      xmlns:pa="http://richfaces.org/panels">
+<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" xmlns:a4j="http://richfaces.org/a4j">
 
 <body>
 <ui:composition template="/templates/template.xhtml">
@@ -11,10 +11,17 @@
     <ui:define name="title">RichFaces Sample</ui:define>
 
     <ui:define name="body">
-        look at left
+        <h:form prependId="false">
+            <h:outputLabel value="Name:" for="nameInput" />
+            <h:inputText id="nameInput" value="${symbol_pound}{richBean.name}">
+                <a4j:ajax event="keyup" render="output" />
+            </h:inputText>
+            <h:panelGroup id="output">
+                <h:outputText value="Hello ${symbol_pound}{richBean.name}!"
+                    rendered="${symbol_pound}{not empty richBean.name}" />
+            </h:panelGroup>
+        </h:form>
     </ui:define>
-
-    <div style="top: auto;"></div>
 </ui:composition>
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml	2010-08-16 15:57:29 UTC (rev 18672)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml	2010-08-16 17:23:23 UTC (rev 18673)
@@ -1,54 +1,16 @@
+#set( $symbol_pound = '#' ) 
+#set( $symbol_dollar = '$' ) 
+#set( $symbol_escape = '\' )
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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" >
+<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" xmlns:a4j="http://richfaces.org/a4j">
 
 <h:head>
-    <title>
-        <ui:define name="title">Application Title</ui:define>
-    </title>
-
+    <title><ui:define name="title">Application Title</ui:define></title>
     <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" />
-
 </h:head>
 
 <h:body>
-    <ui:insert name="scripts" ></ui:insert>
-    <table width="100%">
-        <thead>
-            <tr>
-                <th width="20%" align="left">Content</th>
-                <th width="80%" align="left">
-                    <ui:insert name="body_head">Example</ui:insert>
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr valign="top">
-                <td>
-                    <h:form id="nav">
-                        <p>Examples</p>
-                        <ul>
-                            <li><h:commandLink value="divPanel" action="divPanel" /></li>
-                            <li><h:commandLink value="togglePanel" action="togglePanel" /></li>
-                            <li><h:commandLink value="togglePanel Ajax" action="togglePanel/ajax" /></li>
-                            <li><h:commandLink value="togglePanel Client" action="togglePanel/client" /></li>
-                            <li><h:commandLink value="togglePanel Server" action="togglePanel/server" /></li>
-                        </ul>
-                        <p>QUnit</p>
-                        <ul>
-                            <li><h:commandLink value="togglePanel" action="qunit/togglePanel" /></li>
-                            <li><h:commandLink value="togglePanelItem" action="qunit/togglePanelItem" /></li>
-                        </ul>
-                    </h:form>
-                </td>
-                <td>
-                    <ui:insert name="body">Default content</ui:insert>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
+    <ui:insert name="body">Default content</ui:insert>
 </h:body>
 </html>

Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml	2010-08-16 15:57:29 UTC (rev 18672)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml	2010-08-16 17:23:23 UTC (rev 18673)
@@ -68,6 +68,10 @@
 
         <!-- for javadoc generation -->
         <dependency>
+            <groupId>org.richfaces.ui</groupId>
+            <artifactId>richfaces-components-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.richfaces.core</groupId>
             <artifactId>richfaces-core-api</artifactId>
         </dependency>



More information about the richfaces-svn-commits mailing list