[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking ...
Gavin King
gavin.king at jboss.com
Sat Dec 16 20:04:51 EST 2006
User: gavin
Date: 06/12/16 20:04:51
Modified: examples/booking/src/org/jboss/seam/example/booking
BookingList.java BookingListAction.java
ChangePassword.java ChangePasswordAction.java
HotelBooking.java HotelBookingAction.java
HotelSearching.java HotelSearchingAction.java
LoggedInInterceptor.java Login.java
LoginAction.java Logout.java LogoutAction.java
Register.java RegisterAction.java
Log:
reworked the booking example to take advantage of ochestration from pages.xml
Revision Changes Path
1.5 +2 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BookingList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- BookingList.java 14 Dec 2006 10:40:09 -0000 1.4
+++ BookingList.java 17 Dec 2006 01:04:51 -0000 1.5
@@ -1,4 +1,4 @@
-//$Id: BookingList.java,v 1.4 2006/12/14 10:40:09 gavin Exp $
+//$Id: BookingList.java,v 1.5 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -8,6 +8,6 @@
{
public void getBookings();
public Booking getBooking();
- public String cancel();
+ public void cancel();
public void destroy();
}
\ No newline at end of file
1.18 +2 -3 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- BookingListAction.java 14 Dec 2006 10:40:09 -0000 1.17
+++ BookingListAction.java 17 Dec 2006 01:04:51 -0000 1.18
@@ -1,4 +1,4 @@
-//$Id: BookingListAction.java,v 1.17 2006/12/14 10:40:09 gavin Exp $
+//$Id: BookingListAction.java,v 1.18 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
@@ -56,14 +56,13 @@
.getResultList();
}
- public String cancel()
+ public void cancel()
{
log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}");
Booking cancelled = em.find(Booking.class, booking.getId());
if (cancelled!=null) em.remove( cancelled );
getBookings();
FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}");
- return "main";
}
public Booking getBooking()
1.3 +3 -3 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePassword.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangePassword.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePassword.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ChangePassword.java 10 Sep 2005 16:23:35 -0000 1.2
+++ ChangePassword.java 17 Dec 2006 01:04:51 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: ChangePassword.java,v 1.2 2005/09/10 16:23:35 gavin Exp $
+//$Id: ChangePassword.java,v 1.3 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -6,8 +6,8 @@
@Local
public interface ChangePassword
{
- public String changePassword();
- public String cancel();
+ public void changePassword();
+ public boolean isChanged();
public String getVerify();
public void setVerify(String verify);
1.16 +8 -8 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ChangePasswordAction.java 27 Apr 2006 23:04:47 -0000 1.15
+++ ChangePasswordAction.java 17 Dec 2006 01:04:51 -0000 1.16
@@ -1,4 +1,4 @@
-//$Id: ChangePasswordAction.java,v 1.15 2006/04/27 23:04:47 gavin Exp $
+//$Id: ChangePasswordAction.java,v 1.16 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import static org.jboss.seam.ScopeType.EVENT;
@@ -30,27 +30,27 @@
private String verify;
- public String changePassword()
+ private boolean changed;
+
+ public void changePassword()
{
if ( user.getPassword().equals(verify) )
{
user = em.merge(user);
FacesMessages.instance().add("Password updated");
- return "main";
+ changed = true;
}
else
{
FacesMessages.instance().add("verify", "Re-enter new password");
revertUser();
verify=null;
- return null;
}
}
- public String cancel()
+ public boolean isChanged()
{
- revertUser();
- return "main";
+ return changed;
}
private void revertUser()
1.12 +8 -6 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBooking.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelBooking.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBooking.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- HotelBooking.java 28 Sep 2006 01:16:05 -0000 1.11
+++ HotelBooking.java 17 Dec 2006 01:04:51 -0000 1.12
@@ -1,4 +1,4 @@
-//$Id: HotelBooking.java,v 1.11 2006/09/28 01:16:05 gavin Exp $
+//$Id: HotelBooking.java,v 1.12 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -6,14 +6,16 @@
@Local
public interface HotelBooking
{
- public String selectHotel(Hotel selectedHotel);
+ public void selectHotel(Hotel selectedHotel);
- public String bookHotel();
+ public void bookHotel();
- public String setBookingDetails();
+ public void setBookingDetails();
+ public boolean isBookingValid();
- public String confirm();
- public String cancel();
+ public void confirm();
+
+ public void cancel();
public void destroy();
1.43 +14 -19 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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- HotelBookingAction.java 16 Dec 2006 04:34:58 -0000 1.42
+++ HotelBookingAction.java 17 Dec 2006 01:04:51 -0000 1.43
@@ -1,4 +1,4 @@
-//$Id: HotelBookingAction.java,v 1.42 2006/12/16 04:34:58 gavin Exp $
+//$Id: HotelBookingAction.java,v 1.43 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import static javax.persistence.PersistenceContextType.EXTENDED;
@@ -49,62 +49,57 @@
@Logger
private Log log;
+ private boolean bookingValid;
+
@Begin
- public String selectHotel(Hotel selectedHotel)
+ public void selectHotel(Hotel selectedHotel)
{
hotel = em.merge(selectedHotel);
- return "hotel";
}
- public String bookHotel()
+ public void bookHotel()
{
booking = new Booking(hotel, user);
Calendar calendar = Calendar.getInstance();
booking.setCheckinDate( calendar.getTime() );
calendar.add(Calendar.DAY_OF_MONTH, 1);
booking.setCheckoutDate( calendar.getTime() );
-
- return "book";
}
- public String setBookingDetails()
+ public void setBookingDetails()
{
- if (booking==null || hotel==null) return "main";
-
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -1);
if ( booking.getCheckinDate().before( calendar.getTime() ) )
{
facesMessages.add("Check in date must be a future date");
- return null;
}
else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) )
{
facesMessages.add("Check out date must be later than check in date");
- return null;
}
else
{
- return "confirm";
+ bookingValid=true;
+ }
}
+
+ public boolean isBookingValid()
+ {
+ return bookingValid;
}
@End
- public String confirm()
+ public void confirm()
{
- if (booking==null || hotel==null) return "main";
em.persist(booking);
facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}");
log.info("New booking: #{booking.id} for #{user.username}");
events.raiseTransactionSuccessEvent("bookingConfirmed");
- return "confirmed";
}
@End
- public String cancel()
- {
- return "main";
- }
+ public void cancel() {}
@Destroy @Remove
public void destroy() {}
1.9 +2 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearching.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelSearching.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearching.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- HotelSearching.java 10 Nov 2006 22:53:20 -0000 1.8
+++ HotelSearching.java 17 Dec 2006 01:04:51 -0000 1.9
@@ -1,4 +1,4 @@
-//$Id: HotelSearching.java,v 1.8 2006/11/10 22:53:20 gavin Exp $
+//$Id: HotelSearching.java,v 1.9 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -13,7 +13,7 @@
public void setSearchString(String searchString);
public void find();
- public String nextPage();
+ public void nextPage();
public boolean isNextPageAvailable();
public void destroy();
1.15 +2 -3 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- HotelSearchingAction.java 10 Nov 2006 22:53:20 -0000 1.14
+++ HotelSearchingAction.java 17 Dec 2006 01:04:51 -0000 1.15
@@ -1,4 +1,4 @@
-//$Id: HotelSearchingAction.java,v 1.14 2006/11/10 22:53:20 gavin Exp $
+//$Id: HotelSearchingAction.java,v 1.15 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import java.util.List;
@@ -37,11 +37,10 @@
queryHotels();
}
- public String nextPage()
+ public void nextPage()
{
page++;
queryHotels();
- return "main";
}
private void queryHotels()
1.13 +2 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LoggedInInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LoggedInInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LoggedInInterceptor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- LoggedInInterceptor.java 26 Jul 2006 23:19:55 -0000 1.12
+++ LoggedInInterceptor.java 17 Dec 2006 01:04:51 -0000 1.13
@@ -1,11 +1,11 @@
-//$Id: LoggedInInterceptor.java,v 1.12 2006/07/26 23:19:55 gavin Exp $
+//$Id: LoggedInInterceptor.java,v 1.13 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import java.lang.reflect.Method;
+import javax.faces.event.PhaseId;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
-import javax.faces.event.PhaseId;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.contexts.Contexts;
1.2 +2 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Login.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Login.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Login.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Login.java 19 Aug 2005 03:33:15 -0000 1.1
+++ Login.java 17 Dec 2006 01:04:51 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: Login.java,v 1.1 2005/08/19 03:33:15 gavin Exp $
+//$Id: Login.java,v 1.2 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -6,5 +6,5 @@
@Local
public interface Login
{
- public String login();
+ public void login();
}
1.17 +2 -4 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LoginAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LoginAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LoginAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- LoginAction.java 12 Oct 2006 02:49:35 -0000 1.16
+++ LoginAction.java 17 Dec 2006 01:04:51 -0000 1.17
@@ -1,4 +1,4 @@
-//$Id: LoginAction.java,v 1.16 2006/10/12 02:49:35 gavin Exp $
+//$Id: LoginAction.java,v 1.17 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import java.util.List;
@@ -24,7 +24,7 @@
@PersistenceContext
private EntityManager em;
- public String login()
+ public void login()
{
List<User> results = em.createQuery("select u from User u where u.username=:username and u.password=:password")
.setParameter("username", user.getUsername())
@@ -34,14 +34,12 @@
if ( results.size()==0 )
{
FacesMessages.instance().add("Invalid login");
- return "login";
}
else
{
user = results.get(0);
Contexts.getSessionContext().set("loggedIn", true);
FacesMessages.instance().add("Welcome, #{user.name}");
- return "main";
}
}
1.2 +2 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Logout.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Logout.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Logout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Logout.java 21 Aug 2005 01:13:29 -0000 1.1
+++ Logout.java 17 Dec 2006 01:04:51 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: Logout.java,v 1.1 2005/08/21 01:13:29 gavin Exp $
+//$Id: Logout.java,v 1.2 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -6,5 +6,5 @@
@Local
public interface Logout
{
- public String logout();
+ public void logout();
}
\ No newline at end of file
1.8 +2 -3 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LogoutAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LogoutAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/LogoutAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- LogoutAction.java 15 Apr 2006 23:06:46 -0000 1.7
+++ LogoutAction.java 17 Dec 2006 01:04:51 -0000 1.8
@@ -1,4 +1,4 @@
-//$Id: LogoutAction.java,v 1.7 2006/04/15 23:06:46 gavin Exp $
+//$Id: LogoutAction.java,v 1.8 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Stateless;
@@ -11,9 +11,8 @@
@Name("logout")
public class LogoutAction implements Logout
{
- public String logout()
+ public void logout()
{
Seam.invalidateSession();
- return "login";
}
}
1.2 +3 -2 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Register.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Register.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Register.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Register.java 23 Aug 2005 09:17:39 -0000 1.1
+++ Register.java 17 Dec 2006 01:04:51 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: Register.java,v 1.1 2005/08/23 09:17:39 gavin Exp $
+//$Id: Register.java,v 1.2 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -6,9 +6,10 @@
@Local
public interface Register
{
- public String register();
+ public void register();
public String getVerify();
public void setVerify(String verify);
+ public boolean isRegistered();
public void destroy();
}
\ No newline at end of file
1.16 +10 -5 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- RegisterAction.java 17 Nov 2006 02:49:04 -0000 1.15
+++ RegisterAction.java 17 Dec 2006 01:04:51 -0000 1.16
@@ -1,4 +1,4 @@
-//$Id: RegisterAction.java,v 1.15 2006/11/17 02:49:04 gavin Exp $
+//$Id: RegisterAction.java,v 1.16 2006/12/17 01:04:51 gavin Exp $
package org.jboss.seam.example.booking;
import static org.jboss.seam.ScopeType.EVENT;
@@ -33,7 +33,9 @@
private String verify;
- public String register()
+ private boolean registered;
+
+ public void register()
{
if ( user.getPassword().equals(verify) )
{
@@ -44,22 +46,25 @@
{
em.persist(user);
facesMessages.add("Successfully registered as #{user.username}");
- return "login";
+ registered = true;
}
else
{
facesMessages.add("Username #{user.username} already exists");
- return null;
}
}
else
{
facesMessages.add("verify", "Re-enter your password");
verify=null;
- return null;
}
}
+ public boolean isRegistered()
+ {
+ return registered;
+ }
+
public String getVerify()
{
return verify;
More information about the jboss-cvs-commits
mailing list