[jboss-cvs] jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa ...
Michael Yuan
michael.yuan at jboss.com
Mon Feb 26 17:05:56 EST 2007
User: myuan
Date: 07/02/26 17:05:56
Modified: examples/jpa/src/org/jboss/seam/example/jpa
HotelBookingAction.java HotelSearchingAction.java
RegisterAction.java
Added: examples/jpa/src/org/jboss/seam/example/jpa
AuthenticatorAction.java
Log:
patch the app to latest code
Revision Changes Path
1.6 +5 -3 jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/HotelBookingAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelBookingAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/HotelBookingAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HotelBookingAction.java 27 Jan 2007 19:22:09 -0000 1.5
+++ HotelBookingAction.java 26 Feb 2007 22:05:56 -0000 1.6
@@ -1,4 +1,4 @@
-//$Id: HotelBookingAction.java,v 1.5 2007/01/27 19:22:09 gavin Exp $
+//$Id: HotelBookingAction.java,v 1.6 2007/02/26 22:05:56 myuan Exp $
package org.jboss.seam.example.jpa;
import static org.jboss.seam.ScopeType.SESSION;
@@ -70,11 +70,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
{
1.5 +11 -4 jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/HotelSearchingAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelSearchingAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/HotelSearchingAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- HotelSearchingAction.java 27 Jan 2007 19:22:09 -0000 1.4
+++ HotelSearchingAction.java 26 Feb 2007 22:05:56 -0000 1.5
@@ -1,4 +1,4 @@
-//$Id: HotelSearchingAction.java,v 1.4 2007/01/27 19:22:09 gavin Exp $
+//$Id: HotelSearchingAction.java,v 1.5 2007/02/26 22:05:56 myuan Exp $
package org.jboss.seam.example.jpa;
import java.util.List;
@@ -14,6 +14,8 @@
import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Factory;
+
@Name("hotelSearch")
@Scope(ScopeType.SESSION)
public class HotelSearchingAction
@@ -43,14 +45,19 @@
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)
+ 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();
}
+ @Factory(value="pattern", scope=ScopeType.EVENT)
+ public String getSearchPattern()
+ {
+ return searchString==null ?
+ "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
+ }
+
public boolean isNextPageAvailable()
{
return hotels!=null && hotels.size()==pageSize;
1.6 +3 -4 jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/RegisterAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegisterAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/RegisterAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- RegisterAction.java 27 Jan 2007 19:22:09 -0000 1.5
+++ RegisterAction.java 26 Feb 2007 22:05:56 -0000 1.6
@@ -1,4 +1,4 @@
-//$Id: RegisterAction.java,v 1.5 2007/01/27 19:22:09 gavin Exp $
+//$Id: RegisterAction.java,v 1.6 2007/02/26 22:05:56 myuan Exp $
package org.jboss.seam.example.jpa;
import static org.jboss.seam.ScopeType.EVENT;
@@ -36,8 +36,7 @@
{
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=#{user.username}")
.getResultList();
if (existing.size()==0)
{
@@ -47,7 +46,7 @@
}
else
{
- facesMessages.add("Username #{user.username} already exists");
+ facesMessages.addToControl("username", "Username #{user.username} already exists");
}
}
else
1.1 date: 2007/02/26 22:05:56; author: myuan; state: Exp;jboss-seam/examples/jpa/src/org/jboss/seam/example/jpa/AuthenticatorAction.java
Index: AuthenticatorAction.java
===================================================================
package org.jboss.seam.example.jpa;
import static org.jboss.seam.ScopeType.SESSION;
import java.util.List;
import javax.persistence.EntityManager;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.In;
@Name("authenticator")
public class AuthenticatorAction
{
@In 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=#{identity.username} and u.password=#{identity.password}")
.getResultList();
if ( results.size()==0 )
{
return false;
}
else
{
user = (User) results.get(0);
return true;
}
}
}
More information about the jboss-cvs-commits
mailing list