[seam-commits] Seam SVN: r10752 - in examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking: booking and 3 other directories.

Author: dan.j.allen Date: 2009-05-02 02:17:44 -0400 (Sat, 02 May 2009) New Revision: 10752 Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/model/User.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java Log: cleanups using message formatting in log strings Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/AccountProducerBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -7,9 +7,10 @@ import javax.inject.Produces; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.jboss.seam.examples.booking.account.Registered; import org.jboss.seam.examples.booking.model.User; import org.jboss.seam.examples.booking.security.Identity; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logger; /** * @author Dan Allen @@ -18,6 +19,8 @@ @Stateless class AccountProducerBean implements AccountProducer { + private @Logger Log log; + @PersistenceContext EntityManager em; @Current Identity identity; @@ -31,14 +34,15 @@ { if (identity.isLoggedIn()) { - User user = em.find(User.class, identity.getUsername()); - if (user != null) + log.info("Producing user from username {0}", identity.getUsername()); + User candidate = em.find(User.class, identity.getUsername()); + if (candidate != null) { - user.setPassword(null); - return user; + return new User(candidate.getName(), candidate.getUsername()); } } + log.info("Producing dummy User"); // TODO can't return null, but then we are not honoring the semantics of our binding type return new User(); } Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -7,7 +7,6 @@ import javax.inject.Current; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.jboss.seam.examples.booking.account.Registered; import org.jboss.seam.examples.booking.model.User; import org.jboss.seam.international.StatusMessages; import org.jboss.seam.examples.booking.controls.RegistrationFormControls; Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -31,14 +31,10 @@ import javax.context.RequestScoped; import javax.ejb.Remove; import javax.ejb.Stateful; -import javax.event.Event; -import javax.event.Fires; import javax.inject.Current; import javax.inject.Produces; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.jboss.seam.examples.booking.booking.BookingEvent; -import org.jboss.seam.examples.booking.booking.Confirmed; import org.jboss.seam.examples.booking.account.Registered; import org.jboss.seam.examples.booking.model.Booking; import org.jboss.seam.examples.booking.model.Hotel; @@ -78,7 +74,7 @@ { // NOTE get a fresh reference that's managed by the conversational persistence context hotelSelection = em.find(Hotel.class, hotel.getId()); - log.info("Selected the " + hotelSelection.getName() + " in " + hotelSelection.getCity()); + log.info("Selected the {0} in {1}", hotelSelection.getName(), hotelSelection.getCity()); conversation.begin(); } @@ -118,7 +114,7 @@ { em.persist(booking); //bookingConfirmedEvent.fire(new BookingEvent(booking)); - log.info("New booking at the " + booking.getHotel().getName() + " confirmed for " + booking.getUser().getName()); + log.info("New booking at the {0} confirmed for {1}", booking.getHotel().getName(), booking.getUser().getName()); statusMessages.add("You're booked!"); conversation.end(); } Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -2,7 +2,6 @@ import java.util.List; import javax.ejb.Local; -import org.jboss.seam.examples.booking.booking.BookingEvent; import org.jboss.seam.examples.booking.model.Booking; /** Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -4,7 +4,6 @@ import java.util.List; import javax.annotation.Named; import javax.annotation.PreDestroy; -import javax.context.RequestScoped; import javax.context.SessionScoped; import javax.ejb.Stateful; import javax.event.Observes; @@ -12,8 +11,6 @@ import javax.inject.Produces; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.jboss.seam.examples.booking.booking.BookingEvent; -import org.jboss.seam.examples.booking.booking.Confirmed; import org.jboss.seam.examples.booking.account.Registered; import org.jboss.seam.examples.booking.model.Booking; import org.jboss.seam.examples.booking.model.User; @@ -62,7 +59,7 @@ public void cancelBooking(Booking selectedBooking) { - log.info("Canceling booking " + selectedBooking.getId() + " for " + user.getName()); + log.info("Canceling booking {0} for {1}", selectedBooking.getId(), user.getName()); Booking booking = em.find(Booking.class, selectedBooking.getId()); if (booking != null) { Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/inventory/HotelSearchBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -111,6 +111,6 @@ { hotels = results; } - log.info("Found " + hotels.size() + " hotels matching search term '" + criteria.getSearchString() + "' (limit " + criteria.getPageSize() + ")"); + log.info("Found {0} hotel(s) matching search term ''{1}'' (limit {2})", hotels.size(), criteria.getSearchString(), criteria.getPageSize()); } } Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/model/User.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/model/User.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/model/User.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -49,15 +49,20 @@ private String password; private String name; - public User(String name, String username, String password) + public User() { + } + + public User(String name, String username) + { this.name = name; this.username = username; - this.password = password; } - public User() + public User(String name, String username, String password) { + this(name, username); + this.password = password; } @NotNull Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -5,6 +5,8 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.jboss.seam.examples.booking.model.User; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logger; /** * This implementation of <strong>Authenticator</strong> @@ -17,6 +19,8 @@ @Stateless class AuthenticatorBean implements Authenticator { + private @Logger Log log; + @PersistenceContext EntityManager em; @Current Credentials credentials; @@ -25,6 +29,7 @@ { if (credentials.getUsername() != null && credentials.getUsername().length() > 0) { + log.info("Authenticating {0}...", credentials.getUsername()); User user = em.find(User.class, credentials.getUsername()); if (user != null && user.getPassword().equals(credentials.getPassword())) { @@ -35,4 +40,5 @@ return false; } + } Modified: examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java =================================================================== --- examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2009-05-02 05:36:05 UTC (rev 10751) +++ examples/trunk/booking/ejb-jar/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2009-05-02 06:17:44 UTC (rev 10752) @@ -6,6 +6,7 @@ import javax.faces.context.FacesContext; import javax.inject.Current; import javax.inject.Initializer; +import javax.inject.manager.Manager; /** * @author Dan Allen @@ -17,6 +18,8 @@ { @Current Authenticator authenticator; + @Current Manager manager; + private Credentials credentials; private boolean loggedIn; @@ -62,5 +65,10 @@ loggedIn = false; // FIXME this is a dirty hack to reset a producer FacesContext.getCurrentInstance().getExternalContext().invalidateSession(); + +// Set<Bean<User>> candidates = manager.resolveByType(User.class, new AnnotationLiteral<Registered>() {}); +// assert candidates.size() == 1; +// User user = manager.getInstanceByType(User.class, new AnnotationLiteral<Registered>() {}); +// candidates.iterator().next().destroy(user); } }