taylor      2004/10/13 17:18:06

  Modified:    applications/jsf-demo/src/webapp tree.jsp greeting.jsp
               applications/jsf-demo/src/webapp/WEB-INF web.xml
                        faces-config.xml
  Log:
  finally the tree jsf demo is functional
  it should retain internal JSF nav state amongst views even when you navigate via 
jetspeed to other pages or tabs and back
  
  Revision  Changes    Path
  1.5       +14 -14    jakarta-jetspeed-2/applications/jsf-demo/src/webapp/tree.jsp
  
  Index: tree.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/tree.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tree.jsp  13 Oct 2004 22:42:08 -0000      1.4
  +++ tree.jsp  14 Oct 2004 00:18:05 -0000      1.5
  @@ -51,20 +51,20 @@
   %>
   
   <f:view>
  -     <x:panelLayout id="page">
  -            <f:verbatim><h2>Here is a tree?</h2></f:verbatim>
  -            
  -     <h:form>
  +    <f:verbatim><h2>Here is a tree example.</h2></f:verbatim>
   
  -                <x:tree id="tree" value="#{treeModel}"
  -                        styleClass="tree"
  -                        nodeClass="treenode"
  -                        selectedNodeClass="treenodeSelected"
  -                        expandRoot="true">
  -                </x:tree>
  -                <f:verbatim><br></f:verbatim>
  -
  -     </h:form>
  -     </x:panelLayout>
  +    <h:form>
  +        <x:tree id="tree" value="#{treeModel}"
  +                styleClass="tree"
  +                nodeClass="treenode"
  +                selectedNodeClass="treenodeSelected"
  +                expandRoot="true">
  +        </x:tree>
  +        <f:verbatim><br></f:verbatim>
  +   </h:form>
   
  +    <h:commandLink id="goHome" action="guessGameStart">
  +        <h:outputText value="Return to Guess Game"/>
  +    </h:commandLink>
  +     
   </f:view>
  
  
  
  1.5       +9 -9      jakarta-jetspeed-2/applications/jsf-demo/src/webapp/greeting.jsp
  
  Index: greeting.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/greeting.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- greeting.jsp      11 Sep 2004 18:41:27 -0000      1.4
  +++ greeting.jsp      14 Oct 2004 00:18:05 -0000      1.5
  @@ -17,24 +17,24 @@
   <%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h" %>
   <%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f" %>
   <f:view>
  -     <h:form id="helloForm" >
  +    <h:form id="helloForm" >
       <h2>Hi. My name is Duke.  I'm thinking of a number from
       <h:outputText value="#{UserNumberBean.minimum}"/> to
       <h:outputText value="#{UserNumberBean.maximum}"/>.  Can you guess
       it?</h2>
   
       <h:graphicImage id="waveImg" url="/wave.med.gif" />
  -     <h:inputText id="userNo" value="#{UserNumberBean.userNumber}"
  +      <h:inputText id="userNo" value="#{UserNumberBean.userNumber}"
                         validator="#{UserNumberBean.validate}"/>          
  -      <h:commandButton id="submit" action="success" value="Submit" />
  +     <h:commandButton id="submit" action="success" value="Submit" />
            <p>
  -      <h:message style="color: red; font-family: 'New Century Schoolbook', serif; 
font-style: oblique; text-decoration: overline" id="errors1" for="userNo"/>
  +     <h:message style="color: red; font-family: 'New Century Schoolbook', serif; 
font-style: oblique; text-decoration: overline" id="errors1" for="userNo"/>
   
       </h:form>
       
       <h2>Wanna see a tree?</h2>
  -     <br>
  -     <h:commandLink id="treeLink" action="treeView">
  -             <h:outputText value="Click Here"/>
  -     </h:commandLink>
  -</f:view>  
  \ No newline at end of file
  +    <br>
  +    <h:commandLink id="treeLink" action="treeView">
  +        <h:outputText value="Click Here"/>
  +    </h:commandLink>
  +</f:view>  
  
  
  
  1.2       +1 -1      
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/web.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web.xml   17 Aug 2004 19:58:47 -0000      1.1
  +++ web.xml   14 Oct 2004 00:18:05 -0000      1.2
  @@ -43,7 +43,7 @@
        <description>JavaServer Faces Guess Number Sample Application</description>
        <context-param>
        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
  -     <param-value>client</param-value>
  +     <param-value>server</param-value>
        </context-param>
        <context-param>
        <param-name>javax.faces.application.CONFIG_FILES</param-name>
  
  
  
  1.5       +8 -0      
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/faces-config.xml
  
  Index: faces-config.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/faces-config.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- faces-config.xml  11 Sep 2004 18:41:42 -0000      1.4
  +++ faces-config.xml  14 Oct 2004 00:18:05 -0000      1.5
  @@ -70,6 +70,14 @@
     </navigation-rule>
   
     <navigation-rule>
  +    <from-view-id>/tree.jsp</from-view-id>
  +    <navigation-case>
  +      <from-outcome>guessGameStart</from-outcome>
  +      <to-view-id>/greeting.jsp</to-view-id>
  +    </navigation-case>
  +  </navigation-rule>
  +
  +  <navigation-rule>
      <description>
           The decision rules used by the NavigationHandler to
           determine which view must be displayed after the
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to