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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/15 02:46:25

  Modified:    examples/glassfish/resources/WEB-INF   components.xml
                        pages.xml
  Log:
  use security api
  
  Revision  Changes    Path
  1.3       +22 -18    jboss-seam/examples/glassfish/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/glassfish/resources/WEB-INF/components.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- components.xml	9 Jan 2007 09:12:10 -0000	1.2
  +++ components.xml	15 Feb 2007 07:46:25 -0000	1.3
  @@ -1,9 +1,11 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <components xmlns="http://jboss.com/products/seam/components"
               xmlns:core="http://jboss.com/products/seam/core"
  +            xmlns:security="http://jboss.com/products/seam/security"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation=
                   "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.1.xsd 
  +                 http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
                    http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
   
       <core:init jndi-pattern="java:comp/env/jboss-seam-glassfish/#{ejbName}/local" debug="true"/>    
  @@ -15,4 +17,6 @@
                     conversation-id-parameter="cid"
                     conversation-is-long-running-parameter="clr"/>
   
  +    <security:identity authenticate-method="#{authenticator.authenticate}"/>                  
  +
   </components>
  
  
  
  1.3       +94 -100   jboss-seam/examples/glassfish/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/glassfish/resources/WEB-INF/pages.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- pages.xml	9 Jan 2007 09:12:10 -0000	1.2
  +++ pages.xml	15 Feb 2007 07:46:25 -0000	1.3
  @@ -2,7 +2,8 @@
             "-//JBoss/Seam Pages Configuration DTD 1.1//EN"
             "http://jboss.com/products/seam/pages-1.1.dtd">
   
  -<pages no-conversation-view-id="/main.xhtml">
  +<pages no-conversation-view-id="/main.xhtml"
  +       login-view-id="/home.xhtml">
   
       <page view-id="/register.xhtml">
       
  @@ -20,7 +21,7 @@
       <page view-id="/home.xhtml">
       
           <navigation>
  -            <rule if="#{login.loggedIn}">
  +            <rule if="#{identity.loggedIn}">
                   <redirect view-id="/main.xhtml"/>
               </rule>
           </navigation>
  @@ -37,15 +38,8 @@
           
       </page>
   
  -    <page view-id="/main.xhtml">
  -    
  -        <action execute="#{login.validateLogin}"/>
  -        
  -        <navigation from-action="#{login.validateLogin}">
  -            <rule if="#{not login.loggedIn}">
  -                <redirect view-id="/home.xhtml"/>
  -            </rule>
  -        </navigation>
  +    <page view-id="/main.xhtml"
  +          login-required="true">
           
           <navigation from-action="#{hotelBooking.selectHotel(hot)}">
               <redirect view-id="/hotel.xhtml"/>
  @@ -88,7 +82,7 @@
       
       <page view-id="*">
       
  -        <navigation from-action="#{login.logout}">
  +        <navigation from-action="#{identity.logout}">
               <redirect view-id="/home.xhtml"/>
           </navigation>