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 <a href=3D"mailto:lincolnbaxter(a)gmail.com">Lincoln Baxter, II=
I</a>
  */
-(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<Booking> 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 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <persistence xmlns=3D"http://java.sun.com/xml/ns/persistence" =

    xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation=3D"http://java.sun.com/xml/ns/persistence http://jav=
a.sun.com/xml/ns/persistence/persistence_1_0.xsd" =

-   version=3D"1.0">
+   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">
    <persistence-unit name=3D"booking">
-      <!--<provider>org.eclipse.persistence.jpa.PersistenceProvider</provi=
der>-->
+      <!--
+      <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+      -->
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <!--<jta-data-source>jdbc/__default</jta-data-source>-->
-      <jta-data-source>java:/DefaultDS</jta-data-source>
-      <!--<jta-data-source>jdbc/__arquillian</jta-data-source>-->
+      <jta-data-source>jdbc/__default</jta-data-source>
+      <class>org.jboss.seam.examples.booking.model.User</class>
+      <class>org.jboss.seam.examples.booking.model.Hotel</class>
+      <class>org.jboss.seam.examples.booking.model.Booking</class>
+      <exclude-unlisted-classes/>
       <properties>
          <!-- Properties for Hibernate (default provider for JBoss AS) -->
          <property name=3D"hibernate.hbm2ddl.auto" value=3D"create-drop"/>

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 @@
 <beans xmlns=3D"http://java.sun.com/xml/ns/javaee"
    xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
    xmlns:s=3D"urn:java:seam:core" =

-   xmlns:lc=3D"urn:java:org.jboss.seam.international.locale"
+   xmlns:i18n=3D"urn:java:org.jboss.seam.international.locale"
    xsi:schemaLocation=3D"
       http://java.sun.com/xml/ns/javaee =

       http://docs.jboss.org/cdi/beans_1_0.xsd">
 =

-    <lc:DefaultLocaleProducer>
-    	<s:specializes />
-        <lc:defaultLocaleKey>
-        	<s:value>de_DE</s:value>
-        </lc:defaultLocaleKey>
-    </lc:DefaultLocaleProducer>
-</beans>
\ No newline at end of file
+   <i18n:DefaultLocaleProducer defaultLocaleKey=3D"de_DE">
+      <s:specializes />
+   </i18n:DefaultLocaleProducer>
+</beans>

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 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!DOCTYPE datasources
+   PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+<datasources>
+   <local-tx-datasource>
+      <jndi-name>jdbc/__default</jndi-name>
+      <use-java-context>false</use-java-context>
+      <connection-url>jdbc:hsqldb:.</connection-url>
+      <driver-class>org.hsqldb.jdbcDriver</driver-class>
+      <user-name>sa</user-name>
+      <password></password>
+      <min-pool-size>5</min-pool-size>
+      <max-pool-size>20</max-pool-size>
+   </local-tx-datasource>
+</datasources>

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 @@
                =

             </fieldset>
             =

-            <s:validateForm validatorId=3D"reservationDateRangeValidator" =

+            <s:validateForm validatorId=3D"reservationDateRange" =

             	fields=3D"beginDate=3DcheckInDate:input endDate=3DcheckOutDat=
e:input"/>
          </h:form>
       </div>

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 @@
             =

                <p:input id=3D"current">
                   <h:inputSecret id=3D"password" value=3D"#{currentUser.pa=
ssword}">
-                  	<f:validator validatorId=3D"currentPasswordValidator"/>
+                  	<f:validator validatorId=3D"currentPassword"/>
                   </h:inputSecret>
                </p:input>
             =

@@ -46,7 +46,7 @@
                =

             </fieldset>
             =

-            <s:validateForm validatorId=3D"confirmPasswordValidator"
+            <s:validateForm validatorId=3D"confirmPassword"
             	fields=3D"newPassword=3Dnew:password confirmPassword=3Dconfir=
m:password"/>
          </h:form>
       </div>

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 @@
                <p:input id=3D"confirmPassword">
                   <h:inputSecret id=3D"input" value=3D"#{registrar.confirm=
Password}" redisplay=3D"true">
                      <f:ajax event=3D"blur"
-                             execute=3D"@this @form:password:input @form:p=
asswordCheck"
-                             render=3D"confirmPassword @form:password :mes=
sages"/>
+                        execute=3D"@this @form:password:input @form:passwo=
rdCheck"
+                        render=3D"confirmPassword @form:password :messages=
"/>
                   </h:inputSecret>
                </p:input>
 =

@@ -76,7 +76,7 @@
 =

             </fieldset>
 =

-            <s:validateForm id=3D"passwordCheck" validatorId=3D"confirmPas=
swordValidator"
+            <s:validateForm id=3D"passwordCheck" validatorId=3D"confirmPas=
sword"
             	fields=3D"newPassword=3Dpassword:input confirmPassword=3Dconf=
irmPassword:input"/>
 =

          </h:form>

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.
          </h:panelGroup>
          <h:form id=3D"bookings" rendered=3D"#{identity.loggedIn}">
-            <h:outputText value=3D"No bookings found." rendered=3D"#{booki=
ngs.size() =3D=3D 0}"/>
-            <h:dataTable id=3D"bookings" value=3D"#{bookings}" var=3D"_boo=
king" rendered=3D"#{bookings.size() gt 0}">
+            <h:outputText value=3D"No bookings found." rendered=3D"#{empty=
 bookings}"/>
+            <h:dataTable id=3D"bookings" value=3D"#{bookings}" var=3D"_boo=
king" rendered=3D"#{not empty bookings}">
                <h:column id=3D"nameCol">
                   <f:facet id=3D"nameFct" name=3D"header">Hotel name</f:fa=
cet>
                   #{_booking.hotel.name}


--===============2816080029054998933==--