[jboss-cvs] jboss-seam/examples/glassfish/src/org/jboss/seam/example/booking ...
Michael Yuan
michael.yuan at jboss.com
Mon Feb 26 04:43:28 EST 2007
User: myuan
Date: 07/02/26 04:43:28
Modified: examples/glassfish/src/org/jboss/seam/example/booking
Authenticator.java AuthenticatorAction.java
HotelBookingAction.java HotelSearching.java
HotelSearchingAction.java RegisterAction.java
Log:
Works with the security model. But uses "org.jboss.seam.security.identity" instead of "identity"
Revision Changes Path
1.2 +0 -1 jboss-seam/examples/glassfish/src/org/jboss/seam/example/booking/Authenticator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Authenticator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/src/org/jboss/seam/example/booking/Authenticator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Authenticator.java 15 Feb 2007 07:46:38 -0000 1.1
+++ Authenticator.java 26 Feb 2007 09:43:28 -0000 1.2
@@ -6,5 +6,4 @@
public interface Authenticator
{
boolean authenticate();
- void destroy();
}
1.2 +4 -18 jboss-seam/examples/glassfish/src/org/jboss/seam/example/booking/AuthenticatorAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticatorAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/src/org/jboss/seam/example/booking/AuthenticatorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AuthenticatorAction.java 15 Feb 2007 07:46:38 -0000 1.1
+++ AuthenticatorAction.java 26 Feb 2007 09:43:28 -0000 1.2
@@ -1,29 +1,20 @@
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.ejb.Stateless;
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;
- at Stateful
- at Scope(EVENT)
+ at Stateless
@Name("authenticator")
public class AuthenticatorAction implements Authenticator
{
- @In Identity identity;
-
@PersistenceContext EntityManager em;
@Out(required=false, scope = SESSION)
@@ -31,10 +22,7 @@
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())
+ List results = em.createQuery("select u from User u where u.username=#{org.jboss.seam.security.identity.username} and u.password=#{org.jboss.seam.security.identity.password}")
.getResultList();
if ( results.size()==0 )
@@ -48,6 +36,4 @@
}
}
- @Remove @Destroy
- public void destroy() {}
}
1.6 +10 -5 jboss-seam/examples/glassfish/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/glassfish/src/org/jboss/seam/example/booking/HotelBookingAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HotelBookingAction.java 17 Jan 2007 20:55:54 -0000 1.5
+++ HotelBookingAction.java 26 Feb 2007 09:43:28 -0000 1.6
@@ -1,4 +1,4 @@
-//$Id: HotelBookingAction.java,v 1.5 2007/01/17 20:55:54 myuan Exp $
+//$Id: HotelBookingAction.java,v 1.6 2007/02/26 09:43:28 myuan Exp $
package org.jboss.seam.example.booking;
import static javax.persistence.PersistenceContextType.EXTENDED;
@@ -42,6 +42,9 @@
@Out(required=false)
private Booking booking;
+ @Out(required=false)
+ List<Booking> bookings;
+
@In
private FacesMessages facesMessages;
@@ -74,11 +77,13 @@
calendar.add(Calendar.DAY_OF_MONTH, -1);
if ( booking.getCheckinDate().before( calendar.getTime() ) )
{
- facesMessages.add("Check in date must be a future date");
+ facesMessages.addToControl("checkinDate", "Check in date must be a future date");
+ bookingValid=false;
}
else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) )
{
- facesMessages.add("Check out date must be later than check in date");
+ facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date");
+ bookingValid=false;
}
else
{
@@ -100,9 +105,9 @@
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");
+ // events.raiseTransactionSuccessEvent("bookingConfirmed");
- // bookings = null;
+ bookings = null;
}
@End
1.3 +4 -2 jboss-seam/examples/glassfish/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/glassfish/src/org/jboss/seam/example/booking/HotelSearching.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HotelSearching.java 9 Jan 2007 09:12:10 -0000 1.2
+++ HotelSearching.java 26 Feb 2007 09:43:28 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: HotelSearching.java,v 1.2 2007/01/09 09:12:10 myuan Exp $
+//$Id: HotelSearching.java,v 1.3 2007/02/26 09:43:28 myuan Exp $
package org.jboss.seam.example.booking;
import javax.ejb.Local;
@@ -16,6 +16,8 @@
public void nextPage();
public boolean isNextPageAvailable();
+ public String getSearchPattern();
+
public void destroy();
}
\ No newline at end of file
1.4 +15 -4 jboss-seam/examples/glassfish/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/glassfish/src/org/jboss/seam/example/booking/HotelSearchingAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HotelSearchingAction.java 17 Jan 2007 08:58:51 -0000 1.3
+++ HotelSearchingAction.java 26 Feb 2007 09:43:28 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: HotelSearchingAction.java,v 1.3 2007/01/17 08:58:51 myuan Exp $
+//$Id: HotelSearchingAction.java,v 1.4 2007/02/26 09:43:28 myuan Exp $
package org.jboss.seam.example.booking;
import java.util.List;
@@ -14,6 +14,8 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.Factory;
+
@Stateful
@Name("hotelSearch")
@Scope(ScopeType.SESSION)
@@ -45,9 +47,11 @@
private void queryHotels()
{
- String searchPattern = searchString==null ? "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
- hotels = em.createQuery("select h from Hotel h where lower(h.name) like :search or lower(h.city) like :search or lower(h.zip) like :search or lower(h.address) like :search")
- .setParameter("search", searchPattern)
+ // String searchPattern = searchString==null ? "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
+ // hotels = em.createQuery("select h from Hotel h where lower(h.name) like :search or lower(h.city) like :search or lower(h.zip) like :search or lower(h.address) like :search")
+ // .setParameter("search", searchPattern)
+
+ hotels = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
.setMaxResults(pageSize)
.setFirstResult( page * pageSize )
.getResultList();
@@ -76,6 +80,13 @@
this.searchString = searchString;
}
+ @Factory(value="pattern", scope=ScopeType.EVENT)
+ public String getSearchPattern()
+ {
+ return searchString==null ?
+ "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
+ }
+
@Destroy @Remove
public void destroy() {}
1.3 +6 -4 jboss-seam/examples/glassfish/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/glassfish/src/org/jboss/seam/example/booking/RegisterAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RegisterAction.java 9 Jan 2007 09:12:10 -0000 1.2
+++ RegisterAction.java 26 Feb 2007 09:43:28 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: RegisterAction.java,v 1.2 2007/01/09 09:12:10 myuan Exp $
+//$Id: RegisterAction.java,v 1.3 2007/02/26 09:43:28 myuan Exp $
package org.jboss.seam.example.booking;
import static org.jboss.seam.ScopeType.EVENT;
@@ -39,13 +39,15 @@
{
if ( user.getPassword().equals(verify) )
{
- List existing = em.createQuery("select u.username from User u where u.username=:username")
- .setParameter("username", user.getUsername())
+ // List existing = em.createQuery("select u.username from User u where u.username=:username")
+ // .setParameter("username", user.getUsername())
+ List existing = em.createQuery("select u.username from User u where u.username=#{user.username}")
.getResultList();
if (existing.size()==0)
{
em.persist(user);
- facesMessages.add("Successfully registered as #{user.username}");
+ // facesMessages.add("Successfully registered as #{user.username}");
+ facesMessages.addToControl("username", "Username #{user.username} already exists");
registered = true;
}
else
More information about the jboss-cvs-commits
mailing list