[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking ...

Shane Bryzak Shane_Bryzak at symantec.com
Mon Feb 12 22:49:42 EST 2007


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

  Modified:    examples/booking/src/org/jboss/seam/example/booking           
                        BookingListAction.java ChangePasswordAction.java
                        HotelBookingAction.java HotelSearchingAction.java
                        RegisterAction.java
  Added:       examples/booking/src/org/jboss/seam/example/booking           
                        Authenticator.java AuthenticatorAction.java
  Removed:     examples/booking/src/org/jboss/seam/example/booking           
                        LoggedIn.java LoggedInInterceptor.java Login.java
                        LoginAction.java
  Log:
  JBSEAM-766
  
  Revision  Changes    Path
  1.19      +71 -76    jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BookingListAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- BookingListAction.java	17 Dec 2006 01:04:51 -0000	1.18
  +++ BookingListAction.java	13 Feb 2007 03:49:42 -0000	1.19
  @@ -1,18 +1,14 @@
  -//$Id: BookingListAction.java,v 1.18 2006/12/17 01:04:51 gavin Exp $
  +//$Id: BookingListAction.java,v 1.19 2007/02/13 03:49:42 sbryzak2 Exp $
   package org.jboss.seam.example.booking;
  -
   import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
   import static org.jboss.seam.ScopeType.SESSION;
  -
   import java.io.Serializable;
   import java.util.List;
  -
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
   import javax.ejb.TransactionAttribute;
   import javax.persistence.EntityManager;
   import javax.persistence.PersistenceContext;
  -
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Factory;
   import org.jboss.seam.annotations.In;
  @@ -22,17 +18,17 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.datamodel.DataModel;
   import org.jboss.seam.annotations.datamodel.DataModelSelection;
  +import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.log.Log;
  -
   @Stateful
   @Scope(SESSION)
   @Name("bookingList")
  - at LoggedIn
  + at Restrict("#{identity.loggedIn}")
   @TransactionAttribute(REQUIRES_NEW)
   public class BookingListAction implements BookingList, Serializable
   {
  -   
  +   private static final long serialVersionUID = 1L;
      @PersistenceContext
      private EntityManager em;
      
  @@ -72,5 +68,4 @@
      
      @Destroy @Remove
      public void destroy() {}
  -
   }
  
  
  
  1.19      +70 -76    jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePasswordAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChangePasswordAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePasswordAction.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- ChangePasswordAction.java	12 Feb 2007 16:50:35 -0000	1.18
  +++ ChangePasswordAction.java	13 Feb 2007 03:49:42 -0000	1.19
  @@ -1,27 +1,23 @@
  -//$Id: ChangePasswordAction.java,v 1.18 2007/02/12 16:50:35 gavin Exp $
  +//$Id: ChangePasswordAction.java,v 1.19 2007/02/13 03:49:42 sbryzak2 Exp $
   package org.jboss.seam.example.booking;
  -
   import static org.jboss.seam.ScopeType.EVENT;
  -
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
   import javax.persistence.EntityManager;
   import javax.persistence.PersistenceContext;
  -
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
   import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.core.FacesMessages;
  -
   @Stateful
   @Scope(EVENT)
   @Name("changePassword")
  - at LoggedIn
  + at Restrict("#{identity.loggedIn}")
   public class ChangePasswordAction implements ChangePassword
   {
  -
      @In @Out
      private User user;
      
  @@ -60,12 +56,10 @@
      {
         user = em.find(User.class, user.getUsername());
      }
  -
      public String getVerify()
      {
         return verify;
      }
  -
      public void setVerify(String verify)
      {
         this.verify = verify;
  
  
  
  1.47      +101 -108  jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelBookingAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -b -r1.46 -r1.47
  --- HotelBookingAction.java	11 Feb 2007 20:10:51 -0000	1.46
  +++ HotelBookingAction.java	13 Feb 2007 03:49:42 -0000	1.47
  @@ -1,15 +1,11 @@
  -//$Id: HotelBookingAction.java,v 1.46 2007/02/11 20:10:51 gavin Exp $
  +//$Id: HotelBookingAction.java,v 1.47 2007/02/13 03:49:42 sbryzak2 Exp $
   package org.jboss.seam.example.booking;
  -
   import static javax.persistence.PersistenceContextType.EXTENDED;
  -
   import java.util.Calendar;
  -
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
   import javax.persistence.EntityManager;
   import javax.persistence.PersistenceContext;
  -
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.End;
  @@ -17,13 +13,13 @@
   import org.jboss.seam.annotations.Logger;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
  +import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.log.Log;
  -
   @Stateful
   @Name("hotelBooking")
  - at LoggedIn
  + at Restrict("#{identity.loggedIn}")
   public class HotelBookingAction implements HotelBooking
   {
      
  @@ -65,7 +61,6 @@
         calendar.add(Calendar.DAY_OF_MONTH, 1);
         booking.setCheckoutDate( calendar.getTime() );
      }
  -
      public void setBookingDetails()
      {
         Calendar calendar = Calendar.getInstance();
  @@ -85,7 +80,6 @@
            bookingValid=true;
         }
      }
  -
      public boolean isBookingValid()
      {
         return bookingValid;
  @@ -105,5 +99,4 @@
      
      @Destroy @Remove
      public void destroy() {}
  -
   }
  \ No newline at end of file
  
  
  
  1.16      +73 -81    jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelSearchingAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- HotelSearchingAction.java	17 Dec 2006 01:04:51 -0000	1.15
  +++ HotelSearchingAction.java	13 Feb 2007 03:49:42 -0000	1.16
  @@ -1,23 +1,20 @@
  -//$Id: HotelSearchingAction.java,v 1.15 2006/12/17 01:04:51 gavin Exp $
  +//$Id: HotelSearchingAction.java,v 1.16 2007/02/13 03:49:42 sbryzak2 Exp $
   package org.jboss.seam.example.booking;
  -
   import java.util.List;
  -
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
   import javax.persistence.EntityManager;
   import javax.persistence.PersistenceContext;
  -
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.datamodel.DataModel;
  -
  +import org.jboss.seam.annotations.security.Restrict;
   @Stateful
   @Name("hotelSearch")
   @Scope(ScopeType.SESSION)
  - at LoggedIn
  + at Restrict("#{identity.loggedIn}")
   public class HotelSearchingAction implements HotelSearching
   {
      
  @@ -36,7 +33,6 @@
         page = 0;
         queryHotels();
      }
  -
      public void nextPage()
      {
         page++;
  @@ -61,16 +57,13 @@
      public int getPageSize() {
         return pageSize;
      }
  -
      public void setPageSize(int pageSize) {
         this.pageSize = pageSize;
      }
  -
      public String getSearchString()
      {
         return searchString;
      }
  -
      public void setSearchString(String searchString)
      {
         this.searchString = searchString;
  @@ -78,5 +71,4 @@
      
      @Destroy @Remove
      public void destroy() {}
  -
   }
  \ No newline at end of file
  
  
  
  1.19      +77 -85    jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegisterAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- RegisterAction.java	12 Feb 2007 16:50:35 -0000	1.18
  +++ RegisterAction.java	13 Feb 2007 03:49:42 -0000	1.19
  @@ -1,27 +1,21 @@
  -//$Id: RegisterAction.java,v 1.18 2007/02/12 16:50:35 gavin Exp $
  +//$Id: RegisterAction.java,v 1.19 2007/02/13 03:49:42 sbryzak2 Exp $
   package org.jboss.seam.example.booking;
  -
   import static org.jboss.seam.ScopeType.EVENT;
  -
   import java.util.List;
  -
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
   import javax.persistence.EntityManager;
   import javax.persistence.PersistenceContext;
  -
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.core.FacesMessages;
  -
   @Stateful
   @Scope(EVENT)
   @Name("register")
   public class RegisterAction implements Register
   {
  -
      @In
      private User user;
      
  @@ -69,12 +63,10 @@
      {
         return registered;
      }
  -
      public String getVerify()
      {
         return verify;
      }
  -
      public void setVerify(String verify)
      {
         this.verify = verify;
  
  
  
  1.1      date: 2007/02/13 03:49:42;  author: sbryzak2;  state: Exp;jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Authenticator.java
  
  Index: Authenticator.java
  ===================================================================
  package org.jboss.seam.example.booking;
  
  import javax.ejb.Local;
  
  @Local
  public interface Authenticator
  {
     boolean authenticate();
     void destroy();
  }
  
  
  
  1.1      date: 2007/02/13 03:49:42;  author: sbryzak2;  state: Exp;jboss-seam/examples/booking/src/org/jboss/seam/example/booking/AuthenticatorAction.java
  
  Index: AuthenticatorAction.java
  ===================================================================
  package org.jboss.seam.example.booking;
  
  import static org.jboss.seam.ScopeType.EVENT;
  import static org.jboss.seam.ScopeType.SESSION;
  
  import java.util.List;
  
  import javax.ejb.Remove;
  import javax.ejb.Stateful;
  import javax.persistence.EntityManager;
  import javax.persistence.PersistenceContext;
  
  import org.jboss.seam.annotations.Destroy;
  import org.jboss.seam.annotations.In;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Out;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.security.Identity;
  
  @Stateful
  @Scope(EVENT)
  @Name("authenticator")
  public class AuthenticatorAction implements Authenticator
  {
     @In Identity identity;
     
     @PersistenceContext EntityManager em;
     
     @Out(required=false, scope = SESSION)
     private User user;
     
     public boolean authenticate()
     {
        List results = em.createQuery(
              "select u from User u where u.username=:username and u.password=:password")
              .setParameter("username", identity.getUsername())
              .setParameter("password", identity.getPassword())
              .getResultList();
        
        if ( results.size()==0 )
        {
           return false;
        }
        else
        {
           user = (User) results.get(0);
           return true;
        }
     }
     
     @Remove @Destroy
     public void destroy() {}
  }
  
  
  



More information about the jboss-cvs-commits mailing list