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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/04/30 21:31:48

  Modified:    examples/seambay/resources/WEB-INF    components.xml
                        pages.xml urlrewrite.xml
  Log:
  new user registration, other various stuff
  
  Revision  Changes    Path
  1.3       +6 -0      jboss-seam/examples/seambay/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/seambay/resources/WEB-INF/components.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- components.xml	10 Apr 2007 01:42:38 -0000	1.2
  +++ components.xml	1 May 2007 01:31:48 -0000	1.3
  @@ -19,6 +19,12 @@
                     conversation-id-parameter="cid"
                     conversation-is-long-running-parameter="clr"/>
       
  +    <core:jbpm>
  +        <core:pageflow-definitions>
  +            <value>createauction.jpdl.xml</value>
  +        </core:pageflow-definitions>
  +    </core:jbpm>
  +    
       <security:identity authenticate-method="#{authenticator.authenticate}"/>
       
       <core:managed-persistence-context name="entityManager" auto-create="true"
  
  
  
  1.9       +35 -9     jboss-seam/examples/seambay/resources/WEB-INF/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/resources/WEB-INF/pages.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- pages.xml	24 Apr 2007 12:32:15 -0000	1.8
  +++ pages.xml	1 May 2007 01:31:48 -0000	1.9
  @@ -4,17 +4,15 @@
   
   <pages login-view-id="/login.xhtml">
   
  +    <conversation name="createAuction"
  +                  parameter-name="auctionid"
  +                  parameter-value="#{auction.auctionId}"/>
  +
       <page view-id="/search.xhtml">
           <param name="categoryId" value="#{auctionSearch.selectedCategoryId}"/>
       </page>
   
       <page view-id="/home.xhtml">
  -        <navigation from-action="#{identity.login}">
  -            <rule if="#{s:hasRole('user')}">
  -                <redirect view-id="/profile.xhtml"/>
  -            </rule>
  -        </navigation>
  -        
           <navigation from-action="#{register.start}">
             <redirect view-id="/register.xhtml"/>
           </navigation>
  @@ -28,7 +26,19 @@
           <param name="id" value="#{auctionDetail.selectedAuctionId}"/>
       </page>
       
  -    <page view-id="/sell.xhtml" login-required="true">
  +    <page view-id="/sell.xhtml" 
  +          login-required="true"       
  +          action="#{auctionAction.createAuction}">    
  +        <navigation from-action="next">
  +            <redirect view-id="/sell2.xhtml"/>
  +        </navigation>          
  +        
  +        <navigation from-action="#{identity.logout}">
  +            <redirect view-id="/home.xhtml"/>
  +        </navigation>
  +    </page>
  +    
  +    <page view-id="/sell2.xhtml" login-required="true" conversation="createAuction">
       
       </page>
       
  @@ -36,6 +46,22 @@
           <param name="member" value="#{memberAction.memberName}"/>
       </page>
       
  +    <page view-id="/login.xhtml">
  +        <navigation from-action="#{identity.login}">
  +            <rule if="#{identity.loggedIn}">
  +                <redirect view-id="/home.xhtml"/>
  +            </rule>
  +        </navigation>
  +    </page>
  +    
  +    <page view-id="/register.xhtml" action="#{registerAction.newRegistration}">
  +        <navigation from-action="#{registerAction.register}">
  +            <rule if="#{identity.loggedIn}">
  +                <redirect view-id="/home.xhtml"/>
  +            </rule>
  +        </navigation>
  +    </page>
  +    
       <page view-id="*">
           <navigation from-action="#{auctionSearch.queryAllAuctions}">
               <redirect view-id="/search.xhtml"/>
  @@ -43,7 +69,7 @@
       </page>
             
       <exception class="org.jboss.seam.security.NotLoggedInException">
  -        <redirect view-id="/register.xhtml">
  +        <redirect view-id="/login.xhtml">
               <message severity="warn">You must be logged in to use this feature</message>
           </redirect>
       </exception>
  
  
  
  1.2       +9 -4      jboss-seam/examples/seambay/resources/WEB-INF/urlrewrite.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: urlrewrite.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/resources/WEB-INF/urlrewrite.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- urlrewrite.xml	23 Apr 2007 14:37:02 -0000	1.1
  +++ urlrewrite.xml	1 May 2007 01:31:48 -0000	1.2
  @@ -11,4 +11,9 @@
          <to last="true">/feedback.seam?member=$1</to>
       </rule>
   
  +   <rule>
  +     <from>^/itemdetail/([0-9]*)$</from>
  +     <to last="true">/auction.seam?id=$1</to>
  +   </rule>
  +
   </urlrewrite>
  \ No newline at end of file