From seam-commits at lists.jboss.org Fri Jun 18 16:39:20 2010
Content-Type: multipart/mixed; boundary="===============2816080029054998933=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r13255 - in
examples/trunk/booking-simplified/src/main:
java/org/jboss/seam/examples/booking/account and 4 other directories.
Date: Fri, 18 Jun 2010 16:39:20 -0400
Message-ID: <201006182039.o5IKdKCH019708@svn01.web.mwc.hst.phx2.redhat.com>
--===============2816080029054998933==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: dan.j.allen
Date: 2010-06-18 16:39:19 -0400 (Fri, 18 Jun 2010)
New Revision: 13255
Added:
examples/trunk/booking-simplified/src/main/resources-jbossas/
examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds.=
xml
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/=
booking/account/ConfirmPasswordValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/=
booking/account/CurrentPasswordValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/=
booking/booking/BookingAgent.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/=
booking/booking/ReservationDateRangeValidator.java
examples/trunk/booking-simplified/src/main/resources/META-INF/persistenc=
e.xml
examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans=
.xml
examples/trunk/booking-simplified/src/main/webapp/book.xhtml
examples/trunk/booking-simplified/src/main/webapp/password.xhtml
examples/trunk/booking-simplified/src/main/webapp/register.xhtml
examples/trunk/booking-simplified/src/main/webapp/search.xhtml
Log:
tweaks for JBoss AS
shorten id of validators
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/ex=
amples/booking/account/ConfirmPasswordValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/account/ConfirmPasswordValidator.java 2010-06-18 20:34:35 UTC (rev=
13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/account/ConfirmPasswordValidator.java 2010-06-18 20:39:19 UTC (rev=
13255)
@@ -37,7 +37,7 @@
/**
* @author Lincoln Baxter, II=
I
*/
-(a)FacesValidator("confirmPasswordValidator")
+(a)FacesValidator("confirmPassword")
public class ConfirmPasswordValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/ex=
amples/booking/account/CurrentPasswordValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/account/CurrentPasswordValidator.java 2010-06-18 20:34:35 UTC (rev=
13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/account/CurrentPasswordValidator.java 2010-06-18 20:39:19 UTC (rev=
13255)
@@ -37,7 +37,7 @@
/**
* @author Dan Allen
*/
-(a)FacesValidator("currentPasswordValidator")
+(a)FacesValidator("currentPassword")
public class CurrentPasswordValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/ex=
amples/booking/booking/BookingAgent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/booking/BookingAgent.java 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/booking/BookingAgent.java 2010-06-18 20:39:19 UTC (rev 13255)
@@ -47,7 +47,9 @@
import org.slf4j.Logger;
=
import com.ocpsoft.pretty.time.PrettyTime;
+import java.util.Locale;
import org.jboss.seam.examples.booking.i18n.DefaultBundleKey;
+import org.jboss.seam.international.locale.UserLocale;
=
/**
* @author Dan Allen
@@ -74,6 +76,9 @@
private User user;
=
@Inject
+ private Locale locale;
+
+ @Inject
@Confirmed
private Event bookingConfirmedEventSrc;
=
@@ -130,7 +135,7 @@
public void onBookingComplete(@Observes(during =3D TransactionPhase.AFT=
ER_SUCCESS) @Confirmed final Booking booking)
{
log.info(messageBuilder.get().text("New booking at the {0} confirmed=
for {1}").textParams(booking.getHotel().getName(), booking.getUser().getNa=
me()).build().getText());
- messages.info(new DefaultBundleKey("booking.confirmed")).textDefault=
("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().get=
Name(), new PrettyTime().format(booking.getCheckinDate()));
+ messages.info(new DefaultBundleKey("booking.confirmed")).textDefault=
("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().get=
Name(), new PrettyTime(locale).format(booking.getCheckinDate()));
}
=
@Produces
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/ex=
amples/booking/booking/ReservationDateRangeValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/booking/ReservationDateRangeValidator.java 2010-06-18 20:34:35 UTC=
(rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples=
/booking/booking/ReservationDateRangeValidator.java 2010-06-18 20:39:19 UTC=
(rev 13255)
@@ -45,7 +45,7 @@
* =
* @author Dan Allen
*/
-(a)FacesValidator("reservationDateRangeValidator")
+(a)FacesValidator("reservationDateRange")
public class ReservationDateRangeValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/per=
sistence.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/resources/META-INF/persisten=
ce.xml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/persisten=
ce.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -1,14 +1,18 @@
+ xsi:schemaLocation=3D"http://java.sun.com/xml/ns/persistence http://jav=
a.sun.com/xml/ns/persistence/persistence_2_0.xsd" =
+ version=3D"2.0">
-
+
org.hibernate.ejb.HibernatePersistence
-
- java:/DefaultDS
-
+ jdbc/__default
+ org.jboss.seam.examples.booking.model.User
+ org.jboss.seam.examples.booking.model.Hotel
+ org.jboss.seam.examples.booking.model.Booking
+
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/sea=
m-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/resources/META-INF/seam-bean=
s.xml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/seam-bean=
s.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -22,15 +22,12 @@
=
-
-
-
- de_DE
-
-
-
\ No newline at end of file
+
+
+
+
Added: examples/trunk/booking-simplified/src/main/resources-jbossas/booking=
-ds.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds=
.xml (rev 0)
+++ examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds=
.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -0,0 +1,16 @@
+
+
+
+
+ jdbc/__default
+ false
+ jdbc:hsqldb:.
+ org.hsqldb.jdbcDriver
+ sa
+
+ 5
+ 20
+
+
Modified: examples/trunk/booking-simplified/src/main/webapp/book.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/webapp/book.xhtml 2010-06-18=
20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/book.xhtml 2010-06-18=
20:39:19 UTC (rev 13255)
@@ -83,7 +83,7 @@
=
=
-
Modified: examples/trunk/booking-simplified/src/main/webapp/password.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-0=
6-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-0=
6-18 20:39:19 UTC (rev 13255)
@@ -26,7 +26,7 @@
=
-
+
=
@@ -46,7 +46,7 @@
=
=
-
Modified: examples/trunk/booking-simplified/src/main/webapp/register.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/webapp/register.xhtml 2010-0=
6-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/register.xhtml 2010-0=
6-18 20:39:19 UTC (rev 13255)
@@ -54,8 +54,8 @@
+ execute=3D"@this @form:password:input @form:passwo=
rdCheck"
+ render=3D"confirmPassword @form:password :messages=
"/>
=
@@ -76,7 +76,7 @@
=
=
-
=
Modified: examples/trunk/booking-simplified/src/main/webapp/search.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-=
18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-=
18 20:39:19 UTC (rev 13255)
@@ -104,8 +104,8 @@
You must be logged in to see the list of your hotel bookings.
-
-
+
+
Hotel name
#{_booking.hotel.name}
--===============2816080029054998933==--