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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/12 22:49:42

  Modified:    examples/booking/resources/WEB-INF   components.xml
                        pages.xml
  Log:
  JBSEAM-766
  
  Revision  Changes    Path
  1.10      +29 -19    jboss-seam/examples/booking/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/booking/resources/WEB-INF/components.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- components.xml	16 Dec 2006 14:38:42 -0000	1.9
  +++ components.xml	13 Feb 2007 03:49:42 -0000	1.10
  @@ -1,10 +1,14 @@
   <?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:drools="http://jboss.com/products/seam/drools"
               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/components http://jboss.com/products/seam/components-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
  +                 http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd">
   
       <core:init jndi-pattern="@jndiPattern@" debug="true"/>    
   
  @@ -17,4 +21,10 @@
   
       <core:ejb installed="@embeddedEjb@"/>
   
  +    <drools:rule-base name="securityRules">
  +       <drools:rule-files><value>/META-INF/security-rules.drl</value></drools:rule-files>
  +    </drools:rule-base>    
  +
  +    <security:identity authenticate-method="#{authenticator.authenticate}"/>
  +
   </components>
  \ No newline at end of file
  
  
  
  1.15      +98 -100   jboss-seam/examples/booking/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/booking/resources/WEB-INF/pages.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- pages.xml	11 Feb 2007 20:10:51 -0000	1.14
  +++ pages.xml	13 Feb 2007 03:49:42 -0000	1.15
  @@ -20,7 +20,7 @@
       <page view-id="/home.xhtml">
       
           <navigation>
  -            <rule if="#{login.loggedIn}">
  +            <rule if="#{identity.loggedIn}">
                   <redirect view-id="/main.xhtml"/>
               </rule>
           </navigation>
  @@ -39,10 +39,8 @@
   
       <page view-id="/main.xhtml">
       
  -        <action execute="#{login.validateLogin}"/>
  -        
  -        <navigation from-action="#{login.validateLogin}">
  -            <rule if="#{not login.loggedIn}">
  +        <navigation>
  +            <rule if="#{not identity.loggedIn}">
                   <redirect view-id="/home.xhtml"/>
               </rule>
           </navigation>
  @@ -90,7 +88,7 @@
       
       <page view-id="*">
       
  -        <navigation from-action="#{login.logout}">
  +        <navigation from-action="#{identity.logout}">
               <redirect view-id="/home.xhtml"/>
           </navigation>