You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/12/16 17:16:14 UTC

svn commit: r604645 - in /myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources: ./ src/main/java/org/apache/myfaces/blank/ src/main/webapp/ src/main/webapp/WEB-INF/

Author: mmarinschek
Date: Sun Dec 16 08:16:13 2007
New Revision: 604645

URL: http://svn.apache.org/viewvc?rev=604645&view=rev
Log:
small best-practice changes to the MyFaces archetype

Added:
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java   (contents, props changed)
      - copied, changed from r600628, myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml   (contents, props changed)
      - copied, changed from r600628, myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
Removed:
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
Modified:
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
    myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/page2.jsp

Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml?rev=604645&r1=604644&r2=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/pom.xml Sun Dec 16 08:16:13 2007
@@ -88,14 +88,14 @@
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>1.1.6-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.1.6-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

Copied: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (from r600628, myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java)
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?p2=myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java&p1=myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java&r1=600628&r2=604645&rev=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Sun Dec 16 08:16:13 2007
@@ -23,7 +23,7 @@
  * 
  * @author <a href="mailto:matzew@apache.org">Matthias Weßendorf</a> 
  */
-public class HelloWorldBacking {
+public class HelloWorldController {
 
     
     //properties
@@ -32,7 +32,7 @@
     /**
      * default empty constructor
      */
-    public HelloWorldBacking(){   
+    public HelloWorldController(){
     }
     
     //-------------------getter & setter
@@ -47,7 +47,7 @@
      * Method that is backed to a submit button of a form.
      */
     public String send(){
-        //do real logic
-        return ("success");
+        //do real logic, return a string which will be used for the navigation system of JSF
+        return "success";
     }
 }

Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (from r600628, myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml)
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml?p2=myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml&p1=myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml&r1=600628&r2=604645&rev=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml Sun Dec 16 08:16:13 2007
@@ -8,8 +8,8 @@
 	
 	<!-- managed beans of the simple hello world app -->
 	<managed-bean>
-		<managed-bean-name>helloWorldBacking</managed-bean-name>
-		<managed-bean-class>org.apache.myfaces.blank.HelloWorldBacking</managed-bean-class>
+		<managed-bean-name>helloWorld</managed-bean-name>
+		<managed-bean-class>org.apache.myfaces.blank.HelloWorldController</managed-bean-class>
 		<managed-bean-scope>request</managed-bean-scope>
 	</managed-bean>
 	

Propchange: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=604645&r1=604644&r2=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Sun Dec 16 08:16:13 2007
@@ -25,7 +25,7 @@
 
     <description>MyProject web.xml</description>
 
-    <context-param>
+    <!--optional: context-param>
         <description>Comma separated list of URIs of (additional) faces config files.
             (e.g. /WEB-INF/my-config.xml)
             See JSF 1.0 PRD2, 10.3.2
@@ -33,7 +33,7 @@
         </description>
         <param-name>javax.faces.CONFIG_FILES</param-name>
         <param-value>/WEB-INF/examples-config.xml</param-value>
-    </context-param>
+    </context-param-->
     <context-param>
         <description>State saving method: "client" or "server" (= default)
             See JSF Specification 2.5.3</description>

Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp?rev=604645&r1=604644&r2=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp Sun Dec 16 08:16:13 2007
@@ -6,12 +6,12 @@
     </head>
     <body>
         <f:view>
-            <h:form id="form">
-              <h:panelGrid id="grid" columns="2">
-                <h:outputText id="output1" value="Please enter your name"/>
-                <h:inputText id="input1" value="#{helloWorldBacking.name}" required="true"/>
-                <h:commandButton id="button1" value="press me" action="#{helloWorldBacking.send}"/>
-                <h:message id="message1" for="input1"/>
+            <h:form id="mainForm">
+              <h:panelGrid columns="2">
+                <h:outputLabel for="name" value="Please enter your name" />
+                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
+                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
+                <h:messages showDetail="true" showSummary="false"/>
               </h:panelGrid>
             </h:form>
         </f:view>

Modified: myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/page2.jsp?rev=604645&r1=604644&r2=604645&view=diff
==============================================================================
--- myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/page2.jsp (original)
+++ myfaces/maven/trunk/archetypes/maven-archetype-myfaces/src/main/resources/archetype-resources/src/main/webapp/page2.jsp Sun Dec 16 08:16:13 2007
@@ -5,15 +5,12 @@
         <title>Hello World</title>
     </head>
     <body>
-        <f:view>        
-            <f:verbatim><h2></f:verbatim>
-            <h:outputText value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces"/>
-            <f:verbatim></h2></f:verbatim>
-
-            <h:form id="form2">
-              <h:commandLink id="link1" action="back">
-                <h:outputText id="linkText" value="GO HOME"/>
-              </h:commandLink>
+        <f:view>
+            <h:form id="mainForm">
+                <h2><h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces"/></h2>
+                <h:commandLink action="back">
+                    <h:outputText value="Home"/>
+                </h:commandLink>
             </h:form>
         </f:view>
     </body>