Author: dan.j.allen Date: 2010-06-10 19:51:03 -0400 (Thu, 10 Jun 2010) New Revision: 13124 Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml examples/trunk/booking-simplified/src/main/resources/import.sql Log: syntax Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java =================================================================== --- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2010-06-10 23:51:03 UTC (rev 13124) @@ -29,7 +29,7 @@ @SessionScoped public User getCurrentAccount() { - log.info("Producing dummy User"); - return new User("Current User", "CurrentUser"); + log.info("Producing canned User"); + return new User("Dan Allen", "dan"); } } Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java =================================================================== --- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2010-06-10 23:51:03 UTC (rev 13124) @@ -69,10 +69,10 @@ } } - public @Produces + @Produces @Named @RequestScoped - User getNewUser() + public User getNewUser() { return newUser; } Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java =================================================================== --- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-10 23:51:03 UTC (rev 13124) @@ -136,7 +136,7 @@ manager.fireEvent(new BookingEvent(booking), new AnnotationLiteral<Confirmed>() { }); - log.info("New booking at the {0} confirmed for {1}", booking.getHotel().getName(), booking.getUser().getName()); + log.info(mf.info("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText()); messages.info(new BundleKey("messages.properties", "booking.confirmed")).textDefault("Booking confirmed."); conversation.end(); } @@ -148,18 +148,18 @@ conversation.end(); } - public @Produces + @Produces @Named @ConversationScoped - Booking getBooking() + public Booking getBooking() { return booking; } - public @Produces + @Produces @Named("hotel") @RequestScoped - Hotel getHotelSelection() + public Hotel getHotelSelection() { return booking != null ? booking.getHotel() : hotelSelection; } Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java =================================================================== --- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2010-06-10 23:51:03 UTC (rev 13124) @@ -44,11 +44,11 @@ private final List<Booking> bookingsForUser = new ArrayList<Booking>(); - public @Produces + @Produces @Registered @Named("bookings") @SessionScoped - List<Booking> getBookingsForCurrentUser() + public List<Booking> getBookingsForCurrentUser() { bookingsForUser.clear(); bookingsForUser.addAll(em.createQuery("select b from Booking b join fetch b.hotel where b.user.username = :username order by b.checkinDate").setParameter("username", user.getUsername()).getResultList()); Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml =================================================================== --- examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-10 23:51:03 UTC (rev 13124) @@ -5,7 +5,7 @@ version="1.0"> <persistence-unit name="booking"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>jdbc/__default</jta-data-source> + <jta-data-source>java:/DefaultDS</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: examples/trunk/booking-simplified/src/main/resources/import.sql =================================================================== --- examples/trunk/booking-simplified/src/main/resources/import.sql 2010-06-10 23:24:20 UTC (rev 13123) +++ examples/trunk/booking-simplified/src/main/resources/import.sql 2010-06-10 23:51:03 UTC (rev 13124) @@ -1,7 +1,7 @@ -insert into customer (username, password, name) values ('gavin', 'mexico', 'Gavin King') insert into customer (username, password, name) values ('pete', 'edinburgh', 'Pete Muir') +insert into customer (username, password, name) values ('dan', 'laurel', 'Dan Allen') +insert into customer (username, password, name) values ('lincoln', 'charlotte', 'Lincoln Baxter III') insert into customer (username, password, name) values ('shane', 'brisbane', 'Shane Bryzak') -insert into customer (username, password, name) values ('dan', 'laurel', 'Dan Allen') insert into hotel (id, price, stars, name, address, city, state, zip, country) values (1, 129, 3, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') insert into hotel (id, price, stars, name, address, city, state, zip, country) values (2, 84, 4, 'Doubletree Atlanta-Buckhead', '3342 Peachtree Road NE', 'Atlanta', 'GA', '30326', 'USA') insert into hotel (id, price, stars, name, address, city, state, zip, country) values (3, 289, 4, 'W New York - Union Square', '201 Park Avenue South', 'New York', 'NY', '10003', 'USA')