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

Norman Richards norman.richards at jboss.com
Tue Feb 20 01:16:27 EST 2007


  User: nrichards
  Date: 07/02/20 01:16:27

  Modified:    examples/spring/src/org/jboss/seam/example/spring     
                        Booking.java BookingListAction.java
                        BookingService.java HotelBookingAction.java
  Removed:     examples/spring/src/org/jboss/seam/example/spring     
                        StringStore.java
  Log:
  make booking work
  
  Revision  Changes    Path
  1.3       +16 -14    jboss-seam/examples/spring/src/org/jboss/seam/example/spring/Booking.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Booking.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/example/spring/Booking.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Booking.java	19 Feb 2007 21:53:50 -0000	1.2
  +++ Booking.java	20 Feb 2007 06:16:27 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: Booking.java,v 1.2 2007/02/19 21:53:50 nrichards Exp $
  +//$Id: Booking.java,v 1.3 2007/02/20 06:16:27 nrichards Exp $
   package org.jboss.seam.example.spring;
   
   import java.io.Serializable;
  @@ -22,8 +22,10 @@
   
   @Entity
   @Name("booking")
  -public class Booking implements Serializable
  +public class Booking 
  +    implements Serializable
   {
  +    private static final long serialVersionUID = 2149196747007576668L;
      private Long id;
      private User user;
      private Hotel hotel;
  
  
  
  1.2       +35 -40    jboss-seam/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BookingListAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- BookingListAction.java	19 Feb 2007 21:53:50 -0000	1.1
  +++ BookingListAction.java	20 Feb 2007 06:16:27 -0000	1.2
  @@ -1,15 +1,11 @@
  -//$Id: BookingListAction.java,v 1.1 2007/02/19 21:53:50 nrichards Exp $
  +//$Id: BookingListAction.java,v 1.2 2007/02/20 06:16:27 nrichards Exp $
   package org.jboss.seam.example.spring;
   
  -// 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.TransactionAttribute;
  -
  -import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Factory;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Logger;
  @@ -21,13 +17,12 @@
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.log.Log;
   
  -import org.hibernate.Session;
  -
   @Scope(SESSION)
   @Name("bookingList")
  -// @TransactionAttribute(REQUIRES_NEW)
  -public class BookingListAction implements Serializable
  +public class BookingListAction 
  +    implements Serializable
   {
  +    private static final long serialVersionUID = 8037511081807516466L;
   
      @In("#{bookingService}")
      private BookingService bookingService;
  @@ -43,8 +38,8 @@
      @Logger
      private Log log;
   
  -   @Factory(value="")
  -   // @Observer("bookingConfirmed")
  +    @Factory("bookings")
  +    @Observer("bookingConfirmed")
      public void getBookings()
      {
         bookings = bookingService.findBookingsByUsername(user.getUsername());
  
  
  
  1.3       +11 -5     jboss-seam/examples/spring/src/org/jboss/seam/example/spring/BookingService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BookingService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/example/spring/BookingService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- BookingService.java	20 Feb 2007 00:21:10 -0000	1.2
  +++ BookingService.java	20 Feb 2007 06:16:27 -0000	1.3
  @@ -24,7 +24,8 @@
   	            .list();
   	}
   
  -	public List findBookingsByUsername(String username) {
  +	@SuppressWarnings("unchecked")
  +    public List<Booking> findBookingsByUsername(String username) {
   		return session.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate")
   				.setParameter("username", username).list();
   	}
  @@ -39,7 +40,9 @@
   		}
   	}
   
  -	public void validateBooking(Booking booking) throws ValidationException {
  +	public void validateBooking(Booking booking) 
  +        throws ValidationException 
  +   {
   		Calendar calendar = Calendar.getInstance();
   		calendar.add(Calendar.DAY_OF_MONTH, -1);
   		if (booking.getCheckinDate().before(calendar.getTime())) {
  @@ -49,9 +52,12 @@
   		}
   	}
   
  -	public void bookHotel(Booking booking) throws ValidationException {
  +	public void bookHotel(Booking booking) 
  +        throws ValidationException 
  +    {        
   		validateBooking(booking);
   		session.persist(booking);
  +        session.flush(); 
   	}
   
   	public Hotel findHotelById(Long hotelId) {
  
  
  
  1.3       +70 -84    jboss-seam/examples/spring/src/org/jboss/seam/example/spring/HotelBookingAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelBookingAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/example/spring/HotelBookingAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- HotelBookingAction.java	19 Feb 2007 21:53:50 -0000	1.2
  +++ HotelBookingAction.java	20 Feb 2007 06:16:27 -0000	1.3
  @@ -1,17 +1,9 @@
  -//$Id: HotelBookingAction.java,v 1.2 2007/02/19 21:53:50 nrichards Exp $
  +//$Id: HotelBookingAction.java,v 1.3 2007/02/20 06:16:27 nrichards Exp $
   package org.jboss.seam.example.spring;
   
  -import static org.jboss.seam.ScopeType.SESSION;
  -import static javax.persistence.PersistenceContextType.EXTENDED;
  -
   import java.util.Calendar;
  -import java.util.List;
  -
   import javax.faces.application.FacesMessage;
  -import javax.faces.application.FacesMessage.Severity;
  -
   import org.jboss.seam.annotations.Begin;
  -import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.End;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Logger;
  @@ -21,11 +13,8 @@
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.log.Log;
   
  -import org.hibernate.Session;
  -
   @Name("hotelBooking")
   public class HotelBookingAction {
  -
   	@In("#{bookingService}")
   	private BookingService bookingService;
   
  @@ -78,9 +67,6 @@
   		return bookingValid;
   	}
   
  -	@Out(required = false, scope = SESSION)
  -	List<Booking> bookings;
  -
   	@End
   	public String confirm() {
   		try {
  @@ -89,11 +75,11 @@
   			facesMessages.add(FacesMessage.SEVERITY_ERROR, e.getMessage());
   			return null;
   		}
  +
   		facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}");
   		log.info("New booking: #{booking.id} for #{user.username}");
   
  -		// force refresh in main.xhtml
  -		bookings = null;
  +        events.raiseEvent("bookingConfirmed");
   		return "main";
   	}
   
  
  
  



More information about the jboss-cvs-commits mailing list