[jboss-cvs] jboss-seam/examples/contactlist/resources/WEB-INF ...

[Gavin King]

  User: gavin   
  Date: 06/10/08 10:21:21

  Modified:    examples/contactlist/resources/WEB-INF   components.xml
                        faces-config.xml
  Log:
  nicer messages
  cleaner navrules
  
  Revision  Changes    Path
  1.7       +4 -0      jboss-seam/examples/contactlist/resources/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/resources/WEB-INF/components.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- components.xml	8 Oct 2006 14:03:38 -0000	1.6
  +++ components.xml	8 Oct 2006 14:21:21 -0000	1.7
  @@ -8,6 +8,7 @@
           	<key>contact</key><value>#{contact}</value>
           	<key>created</key><value>#{currentDatetime}</value>
           </property>
  +        <property name="createdMessage">New comment posted</property>
       </component>
       <factory name="comment" value="#{commentHome.instance}"/>
   
  @@ -15,6 +16,9 @@
                 class="org.jboss.seam.framework.EntityHome">
           <property name="entityManager">#{entityManager}</property>
           <property name="entityClass">org.jboss.seam.example.crud.Contact</property>
  +        <property name="createdMessage">New contact #{contact.firstName} #{contact.lastName} created</property>
  +        <property name="deletedMessage">Contact #{contact.firstName} #{contact.lastName} deleted</property>
  +        <property name="updatedMessage">Contact #{contact.firstName} #{contact.lastName} updated</property>
       </component>
       <factory name="contact" value="#{contactHome.instance}"/>
   
  
  
  
  1.4       +15 -6     jboss-seam/examples/contactlist/resources/WEB-INF/faces-config.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: faces-config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/contactlist/resources/WEB-INF/faces-config.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- faces-config.xml	8 Oct 2006 14:03:38 -0000	1.3
  +++ faces-config.xml	8 Oct 2006 14:21:21 -0000	1.4
  @@ -5,23 +5,32 @@
   <faces-config>
   
       <navigation-rule>
  +        <from-view-id>/editContact.xhtml</from-view-id>
        
           <navigation-case>
  -            <from-action>#{contactHome.update}</from-action>
               <from-outcome>updated</from-outcome>
               <to-view-id>/viewContact.xhtml</to-view-id>
               <redirect/>
           </navigation-case>
           
           <navigation-case>
  -            <from-action>#{contactHome.persist}</from-action>
               <from-outcome>persisted</from-outcome>
               <to-view-id>/viewContact.xhtml</to-view-id>
               <redirect/>
           </navigation-case>
           
           <navigation-case>
  -            <from-action>#{contactHome.remove}</from-action>
  +            <from-outcome>removed</from-outcome>
  +            <to-view-id>/search.xhtml</to-view-id>
  +            <redirect/>
  +        </navigation-case>
  +            
  +    </navigation-rule>
  +        
  +    <navigation-rule>
  +        <from-view-id>/viewContact.xhtml</from-view-id>
  +        
  +        <navigation-case>
               <from-outcome>removed</from-outcome>
               <to-view-id>/search.xhtml</to-view-id>
               <redirect/>