[jboss-svn-commits] JBoss PortletSwap SVN: r148 - in portlets/src/framework/SeamBookingPortlet: ejb and 15 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 12 15:01:02 EST 2007


Author: wesleyhales
Date: 2007-11-12 15:01:02 -0500 (Mon, 12 Nov 2007)
New Revision: 148

Added:
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Authenticator.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/AuthenticatorAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Booking.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingList.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingListAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePassword.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePasswordAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Hotel.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBooking.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearching.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearchingAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Register.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/RegisterAction.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/User.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/BookingTest.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/LoginTest.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/testng.xml
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/booking-ds.xml
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/import.sql
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/trailblazer_main.css
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/display.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/edit.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/btn.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-next.png
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-prev.png
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cnt.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/dtpick.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.ad.jpg
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bar.jpg
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.title.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/header_line.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/input.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/sdb.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/spinner.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/th.bg.gif
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml
Removed:
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/Authenticator.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-dev-ds.xml
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-prod-ds.xml
Modified:
   portlets/src/framework/SeamBookingPortlet/ejb/pom.xml
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/META-INF/persistence.xml
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/properties/messages.properties
   portlets/src/framework/SeamBookingPortlet/pom.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/resources/components.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml
Log:
Booking example copy from Seam 2.0.0.GA

Modified: portlets/src/framework/SeamBookingPortlet/ejb/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/pom.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/pom.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -193,9 +193,14 @@
                <groupId>javax.faces</groupId>
                <artifactId>jsf-impl</artifactId>
             </exclusion>
-
          </exclusions>
       </dependency>
+      
+       <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <version>5.6</version>
+      </dependency>
 
    </dependencies>
 
@@ -226,6 +231,14 @@
             </includes>
          </resource>
 
+         <resource>
+            <filtering>false</filtering>
+            <directory>${basedir}/src/main/resources/ds</directory>
+            <includes>
+               <include>import.sql</include>
+            </includes>
+         </resource>
+
       </resources>
       <plugins>
          <plugin>

Deleted: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/Authenticator.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/Authenticator.java	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/Authenticator.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,25 +0,0 @@
-package com.testapp;
-
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.Log;
-import org.jboss.seam.security.Identity;
-
- at Name("authenticator")
-public class Authenticator {
-	@Logger
-	Log log;
-
-	@In
-	Identity identity;
-
-	public boolean authenticate() {
-		log.info("authenticating #0", identity.getUsername());
-		//write your authentication logic here,
-		//return true if the authentication was
-		//successful, false otherwise
-		identity.addRole("admin");
-		return true;
-	}
-}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Authenticator.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Authenticator.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Authenticator.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,9 @@
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Authenticator
+{
+   boolean authenticate();
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/AuthenticatorAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/AuthenticatorAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/AuthenticatorAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,40 @@
+package org.jboss.seam.example.booking;
+
+import static org.jboss.seam.ScopeType.SESSION;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+
+ at Stateless
+ at Name("authenticator")
+public class AuthenticatorAction implements Authenticator
+{
+   @PersistenceContext 
+   private 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;
+      }
+   }
+
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Booking.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Booking.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Booking.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,190 @@
+//$Id: Booking.java,v 1.15 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.hibernate.validator.Pattern;
+import org.jboss.seam.annotations.Name;
+
+ at Entity
+ at Name("booking")
+public class Booking implements Serializable
+{
+   private Long id;
+   private User user;
+   private Hotel hotel;
+   private Date checkinDate;
+   private Date checkoutDate;
+   private String creditCard;
+   private String creditCardName;
+   private int creditCardExpiryMonth;
+   private int creditCardExpiryYear;
+   private boolean smoking;
+   private int beds;
+   
+   public Booking() {}
+   
+   public Booking(Hotel hotel, User user)
+   {
+      this.hotel = hotel;
+      this.user = user;
+   }
+   
+   @Transient
+   public BigDecimal getTotal()
+   {
+      return hotel.getPrice().multiply( new BigDecimal( getNights() ) );
+   }
+
+   @Transient
+   public int getNights()
+   {
+      return (int) ( checkoutDate.getTime() - checkinDate.getTime() ) / 1000 / 60 / 60 / 24;
+   }
+
+   @Id @GeneratedValue
+   public Long getId()
+   {
+      return id;
+   }
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+   
+   @NotNull
+   @Basic @Temporal(TemporalType.DATE) 
+   public Date getCheckinDate()
+   {
+      return checkinDate;
+   }
+   public void setCheckinDate(Date datetime)
+   {
+      this.checkinDate = datetime;
+   }
+
+   @ManyToOne @NotNull
+   public Hotel getHotel()
+   {
+      return hotel;
+   }
+   public void setHotel(Hotel hotel)
+   {
+      this.hotel = hotel;
+   }
+   
+   @ManyToOne @NotNull
+   public User getUser()
+   {
+      return user;
+   }
+   public void setUser(User user)
+   {
+      this.user = user;
+   }
+   
+   @Basic @Temporal(TemporalType.DATE) 
+   @NotNull
+   public Date getCheckoutDate()
+   {
+      return checkoutDate;
+   }
+   public void setCheckoutDate(Date checkoutDate)
+   {
+      this.checkoutDate = checkoutDate;
+   }
+   
+   @NotNull(message="Credit card number is required")
+   @Length(min=16, max=16, message="Credit card number must 16 digits long")
+   @Pattern(regex="^\\d*$", message="Credit card number must be numeric")
+   public String getCreditCard()
+   {
+      return creditCard;
+   }
+
+   public void setCreditCard(String creditCard)
+   {
+      this.creditCard = creditCard;
+   }
+   
+   @Transient
+   public String getDescription()
+   {
+      DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
+      return hotel==null ? null : hotel.getName() + 
+            ", " + df.format( getCheckinDate() ) + 
+            " to " + df.format( getCheckoutDate() );
+   }
+
+   public boolean isSmoking()
+   {
+      return smoking;
+   }
+
+   public void setSmoking(boolean smoking)
+   {
+      this.smoking = smoking;
+   }
+   
+   public int getBeds()
+   {
+      return beds;
+   }
+
+   public void setBeds(int beds)
+   {
+      this.beds = beds;
+   }
+   @NotNull(message="Credit card name is required")
+   @Length(min=3, max=70, message="Credit card name is required")
+   public String getCreditCardName()
+   {
+      return creditCardName;
+   }
+
+   public void setCreditCardName(String creditCardName)
+   {
+      this.creditCardName = creditCardName;
+   }
+
+   public int getCreditCardExpiryMonth()
+   {
+      return creditCardExpiryMonth;
+   }
+
+   public void setCreditCardExpiryMonth(int creditCardExpiryMonth)
+   {
+      this.creditCardExpiryMonth = creditCardExpiryMonth;
+   }
+
+   public int getCreditCardExpiryYear()
+   {
+      return creditCardExpiryYear;
+   }
+
+   public void setCreditCardExpiryYear(int creditCardExpiryYear)
+   {
+      this.creditCardExpiryYear = creditCardExpiryYear;
+   }
+   
+   @Override
+   public String toString()
+   {
+      return "Booking(" + user + ","+ hotel + ")";
+   }
+
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingList.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingList.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingList.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,13 @@
+//$Id: BookingList.java,v 1.7 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface BookingList
+{
+   public void getBookings();
+   public Booking getBooking();
+   public void cancel();
+   public void destroy();
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingListAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingListAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/BookingListAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,76 @@
+//$Id: BookingListAction.java,v 1.23 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
+import static org.jboss.seam.ScopeType.SESSION;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionAttribute;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.datamodel.DataModelSelection;
+import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.log.Log;
+
+ at Stateful
+ at Scope(SESSION)
+ at Name("bookingList")
+ at Restrict("#{identity.loggedIn}")
+ at TransactionAttribute(REQUIRES_NEW)
+public class BookingListAction implements BookingList, Serializable
+{
+   private static final long serialVersionUID = 1L;
+   
+   @PersistenceContext
+   private EntityManager em;
+   
+   @In
+   private User user;
+   
+   @DataModel
+   private List<Booking> bookings;
+   @DataModelSelection 
+   private Booking booking;
+   
+   @Logger 
+   private Log log;
+   
+   @Factory
+   @Observer("bookingConfirmed")
+   public void getBookings()
+   {
+      bookings = em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate")
+            .setParameter("username", user.getUsername())
+            .getResultList();
+   }
+   
+   public void cancel()
+   {
+      log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}");
+      Booking cancelled = em.find(Booking.class, booking.getId());
+      if (cancelled!=null) em.remove( cancelled );
+      getBookings();
+      FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}");
+   }
+   
+   public Booking getBooking()
+   {
+      return booking;
+   }
+   
+   @Remove
+   public void destroy() {}
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePassword.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePassword.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePassword.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,16 @@
+//$Id: ChangePassword.java,v 1.5 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface ChangePassword
+{
+   public void changePassword();
+   public boolean isChanged();
+   
+   public String getVerify();
+   public void setVerify(String verify);
+   
+   public void destroy();
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePasswordAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePasswordAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/ChangePasswordAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,73 @@
+//$Id: ChangePasswordAction.java,v 1.22 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import static org.jboss.seam.ScopeType.EVENT;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.faces.FacesMessages;
+
+ at Stateful
+ at Scope(EVENT)
+ at Name("changePassword")
+ at Restrict("#{identity.loggedIn}")
+public class ChangePasswordAction implements ChangePassword
+{
+   @In @Out
+   private User user;
+   
+   @PersistenceContext
+   private EntityManager em;
+   
+   private String verify;
+   
+   private boolean changed;
+   
+   @In
+   private FacesMessages facesMessages;
+   
+   public void changePassword()
+   {
+      if ( user.getPassword().equals(verify) )
+      {
+         user = em.merge(user);
+         facesMessages.add("Password updated");
+         changed = true;
+      }
+      else 
+      {
+         facesMessages.addToControl("verify", "Re-enter new password");
+         revertUser();
+         verify=null;
+      }
+   }
+   
+   public boolean isChanged()
+   {
+      return changed;
+   }
+   
+   private void revertUser()
+   {
+      user = em.find(User.class, user.getUsername());
+   }
+   public String getVerify()
+   {
+      return verify;
+   }
+   public void setVerify(String verify)
+   {
+      this.verify = verify;
+   }
+   
+   @Remove
+   public void destroy() {}
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Hotel.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Hotel.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Hotel.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,114 @@
+//$Id: Hotel.java,v 1.13 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.jboss.seam.annotations.Name;
+
+ at Entity
+ at Name("hotel")
+public class Hotel implements Serializable
+{
+   private Long id;
+   private String name;
+   private String address;
+   private String city;
+   private String state;
+   private String zip;
+   private String country;
+   private BigDecimal price;
+   
+   @Id @GeneratedValue
+   public Long getId()
+   {
+      return id;
+   }
+   public void setId(Long id)
+   {
+      this.id = id;
+   }
+   
+   @Length(max=50) @NotNull
+   public String getName()
+   {
+      return name;
+   }
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   @Length(max=100) @NotNull
+   public String getAddress()
+   {
+      return address;
+   }
+   public void setAddress(String address)
+   {
+      this.address = address;
+   }
+   
+   @Length(max=40) @NotNull
+   public String getCity()
+   {
+      return city;
+   }
+   public void setCity(String city)
+   {
+      this.city = city;
+   }
+   
+   @Length(min=4, max=6) @NotNull
+   public String getZip()
+   {
+      return zip;
+   }
+   public void setZip(String zip)
+   {
+      this.zip = zip;
+   }
+   
+   @Length(min=2, max=10) @NotNull
+   public String getState()
+   {
+      return state;
+   }
+   public void setState(String state)
+   {
+      this.state = state;
+   }
+   
+   @Length(min=2, max=40) @NotNull
+   public String getCountry()
+   {
+      return country;
+   }
+   public void setCountry(String country)
+   {
+      this.country = country;
+   }
+
+   @Column(precision=6, scale=2)
+   public BigDecimal getPrice()
+   {
+      return price;
+   }
+   public void setPrice(BigDecimal price)
+   {
+      this.price = price;
+   }
+   
+   @Override
+   public String toString()
+   {
+      return "Hotel(" + name + "," + address + "," + city + "," + zip + ")";
+   }
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBooking.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBooking.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBooking.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,22 @@
+//$Id: HotelBooking.java,v 1.14 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HotelBooking
+{
+   public void selectHotel(Hotel selectedHotel);
+   
+   public void bookHotel();
+   
+   public void setBookingDetails();
+   public boolean isBookingValid();
+   
+   public void confirm();
+   
+   public void cancel();
+   
+   public void destroy();
+   
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelBookingAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,108 @@
+//$Id: HotelBookingAction.java,v 1.53 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import static javax.persistence.PersistenceContextType.EXTENDED;
+
+import java.util.Calendar;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.core.Events;
+import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.log.Log;
+
+ at Stateful
+ at Name("hotelBooking")
+ at Restrict("#{identity.loggedIn}")
+public class HotelBookingAction implements HotelBooking
+{
+   
+   @PersistenceContext(type=EXTENDED)
+   private EntityManager em;
+   
+   @In 
+   private User user;
+   
+   @In(required=false) @Out
+   private Hotel hotel;
+   
+   @In(required=false) 
+   @Out(required=false)
+   private Booking booking;
+     
+   @In
+   private FacesMessages facesMessages;
+      
+   @In
+   private Events events;
+   
+   @Logger 
+   private Log log;
+   
+   private boolean bookingValid;
+   
+   @Begin
+   public void selectHotel(Hotel selectedHotel)
+   {
+      hotel = em.merge(selectedHotel);
+   }
+   
+   public void bookHotel()
+   {      
+      booking = new Booking(hotel, user);
+      Calendar calendar = Calendar.getInstance();
+      booking.setCheckinDate( calendar.getTime() );
+      calendar.add(Calendar.DAY_OF_MONTH, 1);
+      booking.setCheckoutDate( calendar.getTime() );
+   }
+   
+   public void setBookingDetails()
+   {
+      Calendar calendar = Calendar.getInstance();
+      calendar.add(Calendar.DAY_OF_MONTH, -1);
+      if ( booking.getCheckinDate().before( calendar.getTime() ) )
+      {
+         facesMessages.addToControl("checkinDate", "Check in date must be a future date");
+         bookingValid=false;
+      }
+      else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) )
+      {
+         facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date");
+         bookingValid=false;
+      }
+      else
+      {
+         bookingValid=true;
+      }
+   }
+   
+   public boolean isBookingValid()
+   {
+      return bookingValid;
+   }
+   
+   @End
+   public void confirm()
+   {
+      em.persist(booking);
+      facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}");
+      log.info("New booking: #{booking.id} for #{user.username}");
+      events.raiseTransactionSuccessEvent("bookingConfirmed");
+   }
+   
+   @End
+   public void cancel() {}
+   
+   @Remove
+   public void destroy() {}
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearching.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearching.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearching.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,23 @@
+//$Id: HotelSearching.java,v 1.12 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface HotelSearching
+{
+   public int getPageSize();
+   public void setPageSize(int pageSize);
+   
+   public String getSearchString();
+   public void setSearchString(String searchString);
+   
+   public String getSearchPattern();
+   
+   public void find();
+   public void nextPage();
+   public boolean isNextPageAvailable();
+
+   public void destroy();
+   
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearchingAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearchingAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/HotelSearchingAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,86 @@
+//$Id: HotelSearchingAction.java,v 1.20 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import java.util.List;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.annotations.security.Restrict;
+
+ at Stateful
+ at Name("hotelSearch")
+ at Scope(ScopeType.SESSION)
+ at Restrict("#{identity.loggedIn}")
+public class HotelSearchingAction implements HotelSearching
+{
+   
+   @PersistenceContext
+   private EntityManager em;
+   
+   private String searchString;
+   private int pageSize = 10;
+   private int page;
+   
+   @DataModel
+   private List<Hotel> hotels;
+   
+   public void find()
+   {
+      page = 0;
+      queryHotels();
+   }
+   public void nextPage()
+   {
+      page++;
+      queryHotels();
+   }
+      
+   private void queryHotels()
+   {
+      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();
+   }
+   
+   public boolean isNextPageAvailable()
+   {
+      return hotels!=null && hotels.size()==pageSize;
+   }
+   
+   public int getPageSize() {
+      return pageSize;
+   }
+   
+   public void setPageSize(int pageSize) {
+      this.pageSize = pageSize;
+   }
+   
+   @Factory(value="pattern", scope=ScopeType.EVENT)
+   public String getSearchPattern()
+   {
+      return searchString==null ? 
+            "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
+   }
+   
+   public String getSearchString()
+   {
+      return searchString;
+   }
+   
+   public void setSearchString(String searchString)
+   {
+      this.searchString = searchString;
+   }
+   
+   @Remove
+   public void destroy() {}
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Register.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Register.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/Register.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,16 @@
+//$Id: Register.java,v 1.5 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Register
+{
+   public void register();
+   public void invalid();
+   public String getVerify();
+   public void setVerify(String verify);
+   public boolean isRegistered();
+   
+   public void destroy();
+}
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/RegisterAction.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/RegisterAction.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/RegisterAction.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,80 @@
+//$Id: RegisterAction.java,v 1.23 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import static org.jboss.seam.ScopeType.EVENT;
+
+import java.util.List;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.faces.FacesMessages;
+
+ at Stateful
+ at Scope(EVENT)
+ at Name("register")
+public class RegisterAction implements Register
+{
+   @In
+   private User user;
+   
+   @PersistenceContext
+   private EntityManager em;
+   
+   @In
+   private FacesMessages facesMessages;
+   
+   private String verify;
+   
+   private boolean registered;
+   
+   public void register()
+   {
+      if ( user.getPassword().equals(verify) )
+      {
+         List existing = em.createQuery("select u.username from User u where u.username=#{user.username}")
+            .getResultList();
+         if (existing.size()==0)
+         {
+            em.persist(user);
+            facesMessages.add("Successfully registered as #{user.username}");
+            registered = true;
+         }
+         else
+         {
+            facesMessages.addToControl("username", "Username #{user.username} already exists");
+         }
+      }
+      else 
+      {
+         facesMessages.addToControl("verify", "Re-enter your password");
+         verify=null;
+      }
+   }
+   
+   public void invalid()
+   {
+      facesMessages.add("Please try again");
+   }
+   
+   public boolean isRegistered()
+   {
+      return registered;
+   }
+   public String getVerify()
+   {
+      return verify;
+   }
+   public void setVerify(String verify)
+   {
+      this.verify = verify;
+   }
+   
+   @Remove
+   public void destroy() {}
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/User.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/User.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/User.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,76 @@
+//$Id: User.java,v 1.8 2007/06/27 00:06:49 gavin Exp $
+package org.jboss.seam.example.booking;
+
+import static org.jboss.seam.ScopeType.SESSION;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.hibernate.validator.Pattern;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+ at Entity
+ at Name("user")
+ at Scope(SESSION)
+ at Table(name="Customer")
+public class User implements Serializable
+{
+   private String username;
+   private String password;
+   private String name;
+   
+   public User(String name, String password, String username)
+   {
+      this.name = name;
+      this.password = password;
+      this.username = username;
+   }
+   
+   public User() {}
+
+   @NotNull
+   @Length(max=100)
+   public String getName()
+   {
+      return name;
+   }
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   @NotNull
+   @Length(min=5, max=15)
+   public String getPassword()
+   {
+      return password;
+   }
+   public void setPassword(String password)
+   {
+      this.password = password;
+   }
+   
+   @Id
+   @Length(min=4, max=15)
+   @Pattern(regex="^\\w*$", message="not a valid username")
+   public String getUsername()
+   {
+      return username;
+   }
+   public void setUsername(String username)
+   {
+      this.username = username;
+   }
+   
+   @Override
+   public String toString() 
+   {
+      return "User(" + username + ")";
+   }
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/BookingTest.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/BookingTest.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/BookingTest.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,288 @@
+//$Id: BookingTest.java,v 1.46 2007/07/16 06:45:47 gavin Exp $
+package org.jboss.seam.example.booking.test;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.Booking;
+import org.jboss.seam.example.booking.Hotel;
+import org.jboss.seam.example.booking.HotelBooking;
+import org.jboss.seam.example.booking.User;
+import org.jboss.seam.mock.SeamTest;
+import org.testng.annotations.Test;
+
+public class BookingTest extends SeamTest
+{
+   
+   @Test
+   public void testBookHotel() throws Exception
+   {
+      
+      new FacesRequest() {
+         
+         @Override
+         protected void invokeApplication() throws Exception
+         {
+            Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+            setValue("#{identity.username}", "gavin");
+            setValue("#{identity.password}", "foobar");            
+            invokeAction("#{identity.login}");
+         }
+         
+      }.run();
+      
+      new FacesRequest("/main.xhtml") {
+
+         @Override
+         protected void updateModelValues() throws Exception
+         {
+            setValue("#{hotelSearch.searchString}", "Union Square");
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            assert invokeAction("#{hotelSearch.find}")==null;
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
+            assert hotels.getRowCount()==1;
+            assert ( (Hotel) hotels.getRowData() ).getCity().equals("NY");
+            assert getValue("#{hotelSearch.searchString}").equals("Union Square");
+            assert !Manager.instance().isLongRunningConversation();
+         }
+         
+      }.run();
+      
+      String id = new FacesRequest("/main.xhtml") {
+         
+         @Override
+         protected void invokeApplication() throws Exception {
+            HotelBooking hotelBooking = (HotelBooking) getInstance("hotelBooking");
+            DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
+            assert hotels.getRowCount()==1;
+            hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            Hotel hotel = (Hotel) Contexts.getConversationContext().get("hotel");
+            assert hotel.getCity().equals("NY");
+            assert hotel.getZip().equals("10011");
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+      }.run();
+      
+      id = new FacesRequest("/hotel.xhtml", id) {
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeAction("#{hotelBooking.bookHotel}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{booking.user}")!=null;
+            assert getValue("#{booking.hotel}")!=null;
+            assert getValue("#{booking.creditCard}")==null;
+            assert getValue("#{booking.creditCardName}")==null;
+            Booking booking = (Booking) Contexts.getConversationContext().get("booking");
+            assert booking.getHotel()==Contexts.getConversationContext().get("hotel");
+            assert booking.getUser()==Contexts.getSessionContext().get("user");
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/book.xhtml", id) {
+
+         @Override
+         protected void processValidations() throws Exception
+         {
+            validateValue("#{booking.creditCard}", "123");
+            assert isValidationFailure();
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            Iterator messages = FacesContext.getCurrentInstance().getMessages();
+            assert messages.hasNext();
+            assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card number must 16 digits long");
+            assert !messages.hasNext();
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+         @Override
+         protected void afterRequest()
+         {
+            assert !isInvokeApplicationBegun();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/book.xhtml", id) {
+
+         @Override
+         protected void processValidations() throws Exception
+         {
+            validateValue("#{booking.creditCardName}", "");
+            assert isValidationFailure();
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            Iterator messages = FacesContext.getCurrentInstance().getMessages();
+            assert messages.hasNext();
+            assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card name is required");
+            assert !messages.hasNext();
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+         @Override
+         protected void afterRequest()
+         {
+            assert !isInvokeApplicationBegun();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/book.xhtml", id) {
+         
+         @Override @SuppressWarnings("deprecation")
+         protected void updateModelValues() throws Exception
+         {  
+            setValue("#{booking.creditCard}", "1234567891021234");
+            setValue("#{booking.creditCardName}", "GAVIN KING");
+            setValue("#{booking.beds}", 2);
+            Date now = new Date();
+            setValue("#{booking.checkinDate}", now);
+            setValue("#{booking.checkoutDate}", now);
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            assert invokeAction("#{hotelBooking.setBookingDetails}")==null;
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            Iterator messages = FacesContext.getCurrentInstance().getMessages();
+            assert messages.hasNext();
+            FacesMessage message = (FacesMessage) messages.next();
+            assert message.getSummary().equals("Check out date must be later than check in date");
+            assert !messages.hasNext();
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+         @Override
+         protected void afterRequest()
+         {
+            assert isInvokeApplicationComplete();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/book.xhtml", id) {
+         
+         @Override @SuppressWarnings("deprecation")
+         protected void updateModelValues() throws Exception
+         {
+            Calendar cal = Calendar.getInstance();
+            cal.add(Calendar.DAY_OF_MONTH, 2);
+            setValue("#{booking.checkoutDate}", cal.getTime() );
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeAction("#{hotelBooking.setBookingDetails}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert Manager.instance().isLongRunningConversation();
+         }
+         
+         @Override
+         protected void afterRequest()
+         {
+            assert isInvokeApplicationComplete();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/confirm.xhtml", id) {
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeAction("#{hotelBooking.confirm}");
+         }
+         
+         @Override
+         protected void afterRequest()
+         {
+            assert isInvokeApplicationComplete();
+         }
+         
+      }.run();
+      
+      new NonFacesRequest("/main.xhtml") {
+
+         @Override
+         protected void renderResponse()
+         {
+            ListDataModel bookings = (ListDataModel) getInstance("bookings");
+            assert bookings.getRowCount()==1;
+            bookings.setRowIndex(0);
+            Booking booking = (Booking) bookings.getRowData();
+            assert booking.getHotel().getCity().equals("NY");
+            assert booking.getUser().getUsername().equals("gavin");
+            assert !Manager.instance().isLongRunningConversation();
+         }
+         
+      }.run();
+      
+      new FacesRequest("/main.xhtml") {
+         
+         @Override
+         protected void invokeApplication()
+         {
+            ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+            bookings.setRowIndex(0);
+            invokeAction("#{bookingList.cancel}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+            assert bookings.getRowCount()==0;
+            assert !Manager.instance().isLongRunningConversation();
+         }
+         
+      }.run();
+      
+   }
+   
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,138 @@
+//$Id: ChangePasswordTest.java,v 1.17 2007/07/16 06:45:47 gavin Exp $
+package org.jboss.seam.example.booking.test;
+
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.User;
+import org.jboss.seam.mock.SeamTest;
+import org.testng.annotations.Test;
+
+public class ChangePasswordTest extends SeamTest
+{
+   
+   @Test
+   public void testChangePassword() throws Exception
+   {
+      
+      new FacesRequest() {
+         
+         @Override
+         protected void invokeApplication() throws Exception
+         {
+            Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+            setValue("#{identity.username}", "gavin");
+            setValue("#{identity.password}", "foobar");
+            invokeMethod("#{identity.login}");
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+         
+         @Override
+         protected void processValidations() throws Exception
+         {
+            validateValue("#{user.password}", "xxx");
+            assert isValidationFailure();
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("foobar");
+            assert !Manager.instance().isLongRunningConversation();
+            assert getValue("#{identity.loggedIn}").equals(true);
+
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void updateModelValues() throws Exception
+         {
+            setValue("#{user.password}", "xxxyyy");
+            setValue("#{changePassword.verify}", "xxyyyx");
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            assert invokeAction("#{changePassword.changePassword}")==null;
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("foobar");
+            assert !Manager.instance().isLongRunningConversation();
+            assert getValue("#{identity.loggedIn}").equals(true);
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void updateModelValues() throws Exception
+         {
+            setValue("#{user.password}", "xxxyyy");
+            setValue("#{changePassword.verify}", "xxxyyy");
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeMethod("#{changePassword.changePassword}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("xxxyyy");
+            assert !Manager.instance().isLongRunningConversation();
+            assert getValue("#{identity.loggedIn}").equals(true);
+
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void updateModelValues() throws Exception
+         {
+            assert getValue("#{user.password}").equals("xxxyyy");
+            setValue("#{user.password}", "foobar");
+            setValue("#{changePassword.verify}", "foobar");
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeMethod("#{changePassword.changePassword}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("foobar");
+            assert !Manager.instance().isLongRunningConversation();
+            assert getValue("#{identity.loggedIn}").equals(true);
+
+         }
+         
+      }.run();
+      
+   }
+
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/LoginTest.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/LoginTest.java	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/LoginTest.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,115 @@
+//$Id: LoginTest.java,v 1.29 2007/07/16 06:45:47 gavin Exp $
+package org.jboss.seam.example.booking.test;
+
+import org.jboss.seam.core.Manager;
+import org.jboss.seam.web.Session;
+import org.jboss.seam.mock.SeamTest;
+import org.testng.annotations.Test;
+
+public class LoginTest extends SeamTest
+{
+   
+   @Test
+   public void testLoginComponent() throws Exception
+   {
+      new ComponentTest() {
+
+         @Override
+         protected void testComponents() throws Exception
+         {
+            assert getValue("#{identity.loggedIn}").equals(false);
+            setValue("#{identity.username}", "gavin");
+            setValue("#{identity.password}", "foobar");
+            invokeMethod("#{identity.login}");
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("foobar");
+            assert getValue("#{identity.loggedIn}").equals(true);
+            invokeMethod("#{identity.logout}");
+            assert getValue("#{identity.loggedIn}").equals(false);
+            setValue("#{identity.username}", "gavin");
+            setValue("#{identity.password}", "tiger");
+            invokeMethod("#{identity.login}");
+            assert getValue("#{identity.loggedIn}").equals(false);
+         }
+         
+      }.run();
+   }
+   
+   @Test
+   public void testLogin() throws Exception
+   {
+      
+      new FacesRequest() {
+         
+         @Override
+         protected void invokeApplication()
+         {
+            assert !isSessionInvalid();
+            assert getValue("#{identity.loggedIn}").equals(false);
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void updateModelValues() throws Exception
+         {
+            assert !isSessionInvalid();
+            setValue("#{identity.username}", "gavin");
+            setValue("#{identity.password}", "foobar");
+         }
+
+         @Override
+         protected void invokeApplication()
+         {
+            invokeAction("#{identity.login}");
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{user.name}").equals("Gavin King");
+            assert getValue("#{user.username}").equals("gavin");
+            assert getValue("#{user.password}").equals("foobar");
+            assert !Manager.instance().isLongRunningConversation();
+            assert getValue("#{identity.loggedIn}").equals(true);
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void invokeApplication()
+         {
+            assert !isSessionInvalid();
+            assert getValue("#{identity.loggedIn}").equals(true);
+         }
+         
+      }.run();
+      
+      new FacesRequest() {
+
+         @Override
+         protected void invokeApplication()
+         {
+            assert !Manager.instance().isLongRunningConversation();
+            assert !isSessionInvalid();
+            invokeMethod("#{identity.logout}");
+            assert Session.instance().isInvalid();
+         }
+
+         @Override
+         protected void renderResponse()
+         {
+            assert getValue("#{identity.loggedIn}").equals(false);
+            assert Session.instance().isInvalid();
+         }
+         
+      }.run();
+      
+   }
+
+}

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/testng.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/testng.xml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/example/booking/test/testng.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,25 @@
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+
+
+
+<suite name="Hotel Booking" verbose="2" parallel="false">
+
+
+
+   <test name="Hotel Booking">
+
+     <classes>
+
+       <class name="org.jboss.seam.example.booking.test.LoginTest"/>
+
+       <class name="org.jboss.seam.example.booking.test.BookingTest"/>
+
+       <class name="org.jboss.seam.example.booking.test.ChangePasswordTest"/>
+
+     </classes>
+
+   </test>
+
+	
+
+</suite>
\ No newline at end of file

Deleted: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,601 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.jsf;
-
-import static javax.faces.event.PhaseId.ANY_PHASE;
-import static javax.faces.event.PhaseId.INVOKE_APPLICATION;
-import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
-import static javax.faces.event.PhaseId.RENDER_RESPONSE;
-import static javax.faces.event.PhaseId.RESTORE_VIEW;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
-import org.jboss.seam.Seam;
-import org.jboss.seam.contexts.Context;
-import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.FacesLifecycle;
-import org.jboss.seam.core.ConversationList;
-import org.jboss.seam.core.ConversationPropagation;
-import org.jboss.seam.core.ConversationStack;
-import org.jboss.seam.core.Events;
-import org.jboss.seam.core.Init;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.exception.Exceptions;
-import org.jboss.seam.faces.FacesManager;
-import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.faces.FacesPage;
-import org.jboss.seam.faces.Switcher;
-import org.jboss.seam.faces.Validation;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.navigation.Pages;
-import org.jboss.seam.pageflow.Pageflow;
-import org.jboss.seam.persistence.PersistenceContexts;
-import org.jboss.seam.transaction.Transaction;
-import org.jboss.seam.util.Reflections;
-
-/**
- * Manages the Seam contexts associated with a JSF request
- * throughout the lifecycle of the request. Performs
- * transaction demarcation when Seam transaction management
- * is enabled. Hacks the JSF lifecyle to provide page
- * actions and page parameters.
- *
- * @author Gavin King
- */
-public class SeamPhaseListener implements PhaseListener
-{
-   private static final long serialVersionUID = -9127555729455066493L;
-
-   private static final LogProvider log = Logging.getLogProvider(SeamPhaseListener.class);
-
-   private static boolean exists = false;
-
-   private static final Method SET_RENDER_PARAMETER;
-   private static final Class ACTION_RESPONSE;
-   private static final Class PORTLET_REQUEST;
-
-   static
-   {
-      Method method = null;
-      Class actionResponseClass = null;
-      Class portletRequestClass = null;
-      try
-      {
-         Class[] parameterTypes = { String.class, String.class };
-         actionResponseClass = Class.forName("javax.portlet.ActionResponse");
-         portletRequestClass = Class.forName("javax.portlet.PortletRequest");
-         method = actionResponseClass.getMethod("setRenderParameter", parameterTypes);
-      }
-      catch (Exception e) {}
-      SET_RENDER_PARAMETER = method;
-      ACTION_RESPONSE = actionResponseClass;
-      PORTLET_REQUEST = portletRequestClass;
-   }
-
-   public SeamPhaseListener()
-   {
-      if (exists)
-      {
-         log.warn("There should only be one Seam phase listener per application");
-      }
-      exists=true;
-   }
-
-   public PhaseId getPhaseId()
-   {
-      return ANY_PHASE;
-   }
-
-   public void beforePhase(PhaseEvent event)
-   {
-      log.trace( "before phase: " + event.getPhaseId() );
-
-      FacesLifecycle.setPhaseId( event.getPhaseId() );
-
-      try
-      {
-         if ( isPortletRequest(event) )
-         {
-            beforePortletPhase(event);
-         }
-         else
-         {
-            beforeServletPhase(event);
-         }
-         raiseEventsBeforePhase(event);
-      }
-      catch (Exception e)
-      {
-         log.error("uncaught exception", e);
-         try
-         {
-            Exceptions.instance().handle(e);
-         }
-         catch (Exception ehe)
-         {
-            log.error("swallowing exception", e);
-         }
-      }
-
-   }
-
-   private void beforeServletPhase(PhaseEvent event)
-   {
-      if ( event.getPhaseId() == RESTORE_VIEW )
-      {
-         beforeRestoreView( event.getFacesContext() );
-      }
-
-      handleTransactionsBeforePhase(event);
-
-      if ( event.getPhaseId() == RENDER_RESPONSE )
-      {
-         beforeRenderResponse( event.getFacesContext() );
-      }
-
-   }
-
-   private void beforePortletPhase(PhaseEvent event)
-   {
-
-      FacesContext facesContext = event.getFacesContext();
-
-      if ( event.getPhaseId() == RESTORE_VIEW || event.getPhaseId() == RENDER_RESPONSE )
-      {
-         beforeRestoreView(facesContext);
-      }
-
-      //delegate to subclass:
-      handleTransactionsBeforePhase(event);
-
-      if ( event.getPhaseId() == RENDER_RESPONSE )
-      {
-         afterRestoreView(facesContext);
-         beforeRenderResponse( event.getFacesContext() );
-      }
-   }
-
-   public void afterPhase(PhaseEvent event)
-   {
-      log.trace( "after phase: " + event.getPhaseId() );
-
-      try
-      {
-         raiseEventsAfterPhase(event);
-         if ( isPortletRequest(event) )
-         {
-            afterPortletPhase(event);
-         }
-         else
-         {
-            afterServletPhase(event);
-         }
-      }
-      catch (Exception e)
-      {
-         log.error("uncaught exception", e);
-         try
-         {
-            Exceptions.instance().handle(e);
-         }
-         catch (Exception ehe)
-         {
-            log.error("swallowing exception", e);
-         }
-      }
-
-      FacesLifecycle.clearPhaseId();
-
-   }
-
-   private void afterServletPhase(PhaseEvent event)
-   {
-
-      FacesContext facesContext = event.getFacesContext();
-
-      if ( event.getPhaseId() == RESTORE_VIEW )
-      {
-         afterRestoreView(facesContext);
-      }
-      else if ( event.getPhaseId() == INVOKE_APPLICATION )
-      {
-         afterInvokeApplication();
-      }
-      else if ( event.getPhaseId() == PROCESS_VALIDATIONS )
-      {
-         afterProcessValidations(facesContext);
-      }
-
-      //has to happen after, since restoreAnyConversationContext()
-      //can add messages
-      FacesMessages.afterPhase();
-
-      handleTransactionsAfterPhase(event);
-
-      if ( event.getPhaseId() == RENDER_RESPONSE )
-      {
-         afterRenderResponse(facesContext);
-      }
-      else if ( facesContext.getResponseComplete() )
-      {
-         afterResponseComplete(facesContext);
-      }
-   }
-
-   private void afterPortletPhase(PhaseEvent event)
-   {
-      FacesContext facesContext = event.getFacesContext();
-
-      if ( event.getPhaseId() == RESTORE_VIEW )
-      {
-         afterRestoreView(facesContext);
-      }
-      else if ( event.getPhaseId() == INVOKE_APPLICATION )
-      {
-         afterInvokeApplication();
-      }
-      else if ( event.getPhaseId() == PROCESS_VALIDATIONS )
-      {
-         afterProcessValidations(facesContext);
-      }
-
-      FacesMessages.afterPhase();
-
-      //delegate to subclass:
-      handleTransactionsAfterPhase(event);
-
-      if ( event.getPhaseId() == RENDER_RESPONSE )
-      {
-         //writeConversationIdToResponse( facesContext.getExternalContext().getResponse() );
-         afterRenderResponse(facesContext);
-      }
-      else if ( event.getPhaseId() == INVOKE_APPLICATION || facesContext.getRenderResponse() || facesContext.getResponseComplete() )
-      {
-         Manager manager = Manager.instance();
-         manager.beforeRedirect();
-         if ( manager.isLongRunningConversation() )
-         {
-            setPortletRenderParameter(
-                  facesContext.getExternalContext().getResponse(),
-                  manager.getConversationIdParameter(),
-                  manager.getCurrentConversationId()
-               );
-         }
-         afterResponseComplete(facesContext);
-      }
-
-   }
-
-   private static void setPortletRenderParameter(Object response, String conversationIdParameter, String conversationId)
-   {
-      if ( ACTION_RESPONSE.isInstance(response) )
-      {
-         Reflections.invokeAndWrap(SET_RENDER_PARAMETER, response, conversationIdParameter, conversationId);
-      }
-   }
-
-   private static boolean isPortletRequest(PhaseEvent event)
-   {
-      return PORTLET_REQUEST!=null &&
-            PORTLET_REQUEST.isInstance( event.getFacesContext().getExternalContext().getRequest() );
-   }
-
-   public void handleTransactionsBeforePhase(PhaseEvent event)
-   {
-      if ( Init.instance().isTransactionManagementEnabled() )
-      {
-         try{
-         PhaseId phaseId = event.getPhaseId();
-         boolean beginTran = phaseId == PhaseId.RENDER_RESPONSE ||
-               phaseId == ( Transaction.instance().isConversationContextRequired() ? PhaseId.APPLY_REQUEST_VALUES : PhaseId.RESTORE_VIEW );
-               //( phaseId == PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
-
-         if (beginTran)
-         {
-            begin(phaseId);
-         }
-         }catch(Exception e){
-            log.error("-----------------swallow");
-            e.printStackTrace();
-         }
-      }
-   }
-
-   public void handleTransactionsAfterPhase(PhaseEvent event)
-   {
-      if ( Init.instance().isTransactionManagementEnabled() )
-      {
-         PhaseId phaseId = event.getPhaseId();
-         boolean commitTran = phaseId == PhaseId.INVOKE_APPLICATION ||
-               event.getFacesContext().getRenderResponse() || //TODO: no need to commit the tx if we failed to restore the view
-               event.getFacesContext().getResponseComplete() ||
-               phaseId == PhaseId.RENDER_RESPONSE;
-               //( phaseId == PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
-
-         if (commitTran)
-         {
-            commitOrRollback(phaseId); //we commit before destroying contexts, cos the contexts have the PC in them
-         }
-      }
-   }
-
-   protected void handleTransactionsAfterPageActions(FacesContext facesContext)
-   {
-      if ( Init.instance().isTransactionManagementEnabled() )
-      {
-         commitOrRollback(PhaseId.INVOKE_APPLICATION);
-         if ( !facesContext.getResponseComplete() )
-         {
-            begin(PhaseId.INVOKE_APPLICATION);
-         }
-      }
-   }
-
-   protected void afterInvokeApplication()
-   {
-      if ( Init.instance().isTransactionManagementEnabled() )
-      {
-         addTransactionFailedMessage();
-      }
-   }
-
-   protected void afterProcessValidations(FacesContext facesContext)
-   {
-      Validation.instance().afterProcessValidations(facesContext);
-   }
-
-   /**
-    * Set up the Seam contexts, except for the conversation
-    * context
-    */
-   protected void beforeRestoreView(FacesContext facesContext)
-   {
-      FacesLifecycle.beginRequest( facesContext.getExternalContext() );
-   }
-
-   /**
-    * Restore the page and conversation contexts during a JSF request
-    */
-   protected void afterRestoreView(FacesContext facesContext)
-   {
-      FacesLifecycle.resumePage();
-      Map parameters = facesContext.getExternalContext().getRequestParameterMap();
-      ConversationPropagation.instance().restoreConversationId(parameters);
-      boolean conversationFound = Manager.instance().restoreConversation();
-      FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
-      postRestorePage(facesContext, parameters, conversationFound);
-   }
-
-   public void raiseEventsBeforePhase(PhaseEvent event)
-   {
-      if ( Contexts.isApplicationContextActive() )
-      {
-         Events.instance().raiseEvent("org.jboss.seam.beforePhase", event);
-      }
-
-      /*if ( Contexts.isConversationContextActive() && Init.instance().isJbpmInstalled() && Pageflow.instance().isInProcess() )
-      {
-         String name;
-         PhaseId phaseId = event.getPhaseId();
-         if ( phaseId == PhaseId.PROCESS_VALIDATIONS )
-         {
-            name = "process-validations";
-         }
-         else if ( phaseId == PhaseId.UPDATE_MODEL_VALUES )
-         {
-            name = "update-model-values";
-         }
-         else if ( phaseId == PhaseId.INVOKE_APPLICATION )
-         {
-            name = "invoke-application";
-         }
-         else if ( phaseId == PhaseId.RENDER_RESPONSE )
-         {
-            name = "render-response";
-         }
-         else
-         {
-            return;
-         }
-         Pageflow.instance().processEvents(name);
-      }*/
-   }
-
-   public void raiseEventsAfterPhase(PhaseEvent event)
-   {
-      if ( Contexts.isApplicationContextActive() )
-      {
-         Events.instance().raiseEvent("org.jboss.seam.afterPhase", event);
-      }
-   }
-
-   /**
-    * Add a faces message when Seam-managed transactions fail.
-    */
-   protected void addTransactionFailedMessage()
-   {
-      try
-      {
-         if ( Transaction.instance().isRolledBackOrMarkedRollback() )
-         {
-            FacesMessages.instance().addFromResourceBundleOrDefault(
-                     FacesMessage.SEVERITY_WARN,
-                     "org.jboss.seam.TransactionFailed",
-                     "Transaction failed"
-                  );
-         }
-      }
-      catch (Exception e) {} //swallow silently, not important
-   }
-
-   protected void beforeRenderResponse(FacesContext facesContext)
-   {
-
-      if ( Contexts.isPageContextActive() )
-      {
-         Context pageContext = Contexts.getPageContext();
-         //after every time that the view may have changed,
-         //we need to flush the page context, since the
-         //attribute map is being discarder
-         pageContext.flush();
-         //force refresh of the conversation lists (they are kept in PAGE context)
-         pageContext.remove(Seam.getComponentName(Switcher.class));
-         pageContext.remove("org.jboss.seam.core.conversationList");
-         pageContext.remove("org.jboss.seam.core.conversationStack");
-      }
-
-      preRenderPage(facesContext);
-
-      if ( facesContext.getResponseComplete() )
-      {
-         //workaround for a bug in MyFaces prior to 1.1.3
-         if ( Init.instance().isMyFacesLifecycleBug() )
-         {
-            FacesLifecycle.endRequest( facesContext.getExternalContext() );
-         }
-      }
-      else //if the page actions did not call responseComplete()
-      {
-         FacesMessages.instance().beforeRenderResponse();
-         //do this both before and after render, since conversations
-         //and pageflows can begin during render
-         FacesManager.instance().prepareBackswitch(facesContext);
-      }
-
-      FacesPage.instance().storeConversation();
-      FacesPage.instance().storePageflow();
-
-      PersistenceContexts persistenceContexts = PersistenceContexts.instance();
-      if (persistenceContexts != null)
-      {
-          persistenceContexts.beforeRender();
-      }
-   }
-
-   protected void afterRenderResponse(FacesContext facesContext)
-   {
-      //do this both before and after render, since conversations
-      //and pageflows can begin during render
-      FacesManager.instance().prepareBackswitch(facesContext);
-
-      PersistenceContexts persistenceContexts = PersistenceContexts.instance();
-      if (persistenceContexts != null)
-      {
-          persistenceContexts.afterRender();
-      }
-
-      ExternalContext externalContext = facesContext.getExternalContext();
-      Manager.instance().endRequest( externalContext.getSessionMap() );
-      FacesLifecycle.endRequest(externalContext);
-   }
-
-   protected void afterResponseComplete(FacesContext facesContext)
-   {
-      //responseComplete() was called by one of the other phases,
-      //so we will never get to the RENDER_RESPONSE phase
-      //Note: we can't call Manager.instance().beforeRedirect() here,
-      //since a redirect is not the only reason for a responseComplete
-      ExternalContext externalContext = facesContext.getExternalContext();
-      Manager.instance().endRequest( externalContext.getSessionMap() );
-      FacesLifecycle.endRequest( facesContext.getExternalContext() );
-   }
-
-   private void postRestorePage(FacesContext facesContext, Map parameters, boolean conversationFound)
-   {
-      if ( !Pages.isDebugPage() )
-      {
-         // Only redirect to no-conversation-view if a login redirect isn't required
-         if (!conversationFound && !Pages.instance().isLoginRedirectRequired(facesContext))
-         {
-            Pages.instance().redirectToNoConversationView();
-         }
-
-         Manager.instance().handleConversationPropagation(parameters);
-
-         if ( Init.instance().isJbpmInstalled() )
-         {
-            Pageflow.instance().validatePageflow(facesContext);
-         }
-
-         Pages.instance().postRestore(facesContext);
-      }
-   }
-
-   private boolean preRenderPage(FacesContext facesContext)
-   {
-      if ( Pages.isDebugPage() )
-      {
-         return false;
-      }
-      else
-      {
-         FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
-         boolean actionsWereCalled = false;
-         try
-         {
-            actionsWereCalled = Pages.instance().preRender(facesContext);
-            return actionsWereCalled;
-         }
-         finally
-         {
-            FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE);
-            if (actionsWereCalled)
-            {
-               FacesMessages.afterPhase();
-               handleTransactionsAfterPageActions(facesContext); //TODO: does it really belong in the finally?
-            }
-         }
-      }
-   }
-
-   void begin(PhaseId phaseId)
-   {
-      try
-      {
-         if ( !Transaction.instance().isActiveOrMarkedRollback() )
-         {
-            log.debug("beginning transaction prior to phase: " + phaseId);
-            Transaction.instance().begin();
-         }
-      }
-      catch (Exception e)
-      {
-         throw new IllegalStateException("Could not start transaction", e);
-      }
-   }
-
-   void commitOrRollback(PhaseId phaseId)
-   {
-      try
-      {
-         if ( Transaction.instance().isActive() )
-         {
-            log.debug("committing transaction after phase: " + phaseId);
-            Transaction.instance().commit();
-         }
-         else if ( Transaction.instance().isRolledBackOrMarkedRollback() )
-         {
-            log.debug("rolling back transaction after phase: " + phaseId);
-            Transaction.instance().rollback();
-         }
-      }
-      catch (Exception e)
-      {
-         throw new IllegalStateException("Could not commit transaction", e);
-      }
-   }
-
-}

Modified: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/META-INF/persistence.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/META-INF/persistence.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Persistence deployment descriptor for dev profile -->
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
              version="1.0">
-
-   <persistence-unit name="seamtestapp">
+   <persistence-unit name="bookingDatabase">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <jta-data-source>java:/MasterDS</jta-data-source>
+      <jta-data-source>java:/bookingDatasource</jta-data-source>
       <properties>
-         <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
-         <property name="hibernate.hbm2ddl.auto" value="validate"/>
-         <property name="hibernate.cache.use_query_cache" value="true"/>
-         <!--<property name="hibernate.show_sql" value="true"/>-->
+         <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+         <property name="hibernate.show_sql" value="true"/>
+         <!-- These are the default for JBoss EJB3, but not for HEM: -->
+         <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+         <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
          <property name="jboss.entity.manager.factory.jndi.name" value="java:/seamtestappEntityManagerFactory"/>
       </properties>
    </persistence-unit>
-
-</persistence>
+</persistence>
\ No newline at end of file

Copied: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/booking-ds.xml (from rev 147, portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-dev-ds.xml)
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/booking-ds.xml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/booking-ds.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="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>bookingDatasource</jndi-name>
+        <connection-url>jdbc:hsqldb:.</connection-url>
+        <driver-class>org.hsqldb.jdbcDriver</driver-class>
+        <user-name>sa</user-name>
+        <password></password>
+    </local-tx-datasource>
+</datasources>
+

Added: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/import.sql
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/import.sql	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/import.sql	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,22 @@
+insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King')
+insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain')
+insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA')

Deleted: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-dev-ds.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-dev-ds.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-dev-ds.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="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>MasterDS</jndi-name>
-       <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}dvd</connection-url>
-        <!-- <connection-url>jdbc:hsqldb:.</connection-url> -->
-        <driver-class>org.hsqldb.jdbcDriver</driver-class>
-        <user-name>sa</user-name>
-        <password></password>
-    </local-tx-datasource>
-
-
-   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
-           name="jboss:service=Hypersonic,database=dvd">
-        <attribute name="Database">dvd</attribute>
-        <attribute name="InProcessMode">true</attribute>
-    </mbean>
-    
-</datasources>
-

Deleted: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-prod-ds.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-prod-ds.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/ds/testSeam-prod-ds.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-   
-   <!--<local-tx-datasource>
-      <jndi-name>testSeamDatasource</jndi-name>
-      <connection-url>jdbc:oracle:thin:@10.102.18.196:1521:dvmis</connection-url>
-      <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
-      <user-name>api</user-name>
-      <password>api_freedom</password>-->
-<!-- 
-      <exception-sorter-class-name>
-         org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
-      </exception-sorter-class-name>
-      <metadata>
-         <type-mapping>mySQL</type-mapping>
-      </metadata>
--->
-   <!--</local-tx-datasource>-->
-    
-</datasources>
-

Modified: portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/properties/messages.properties
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/properties/messages.properties	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/resources/properties/messages.properties	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,42 +1,13 @@
-up=\u2191
-down=\u2193
-left=\u2039
-right=\u203A
-
-validator.assertFalse=validation failed
-validator.assertTrue=validation failed
-validator.future=must be a future date
-validator.length=length must be between {min} and {max}
-validator.max=must be less than or equal to {value}
-validator.min=must be greater than or equal to {value}
-validator.notNull=may not be null
-validator.past=must be a past date
-validator.pattern=must match "{regex}"
-validator.range=must be between {min} and {max}
-validator.size=size must be between {min} and {max}
-validator.email=must be a well-formed email address
-
-org.jboss.seam.loginFailed=Login failed
-org.jboss.seam.loginSuccessful=Welcome, #0
-
-org.jboss.seam.TransactionFailed=Transaction failed
-org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request
-org.jboss.seam.IllegalNavigation=Illegal navigation
-org.jboss.seam.ProcessEnded=Process #0 already ended
-org.jboss.seam.ProcessNotFound=Process #0 not found
-org.jboss.seam.TaskEnded=Task #0 already ended
-org.jboss.seam.TaskNotFound=Task #0 not found
-org.jboss.seam.NotLoggedIn=Please log in first
-
 javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type
 javax.faces.component.UIInput.REQUIRED=value is required
+javax.faces.component.UIInput.REQUIRED_detail=value is required
 javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information
 javax.faces.component.UISelectOne.INVALID=value is not valid
 javax.faces.component.UISelectMany.INVALID=value is not valid
 
 javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number
 javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1}
-javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be an integer
+javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be a number
 javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits
 javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false
 javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false)
@@ -44,6 +15,8 @@
 javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255
 javax.faces.converter.CharacterConverter.CHARACTER=value must be a character
 javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character
+javax.faces.convert.DateTimeConverter.CONVERSION value must be a datetime
+javax.faces.convert.DateTimeConverter.CONVERSION_detail value must be a datetime
 javax.faces.converter.DateTimeConverter.DATE=value must be a date
 javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date,  eg. {1}
 javax.faces.converter.DateTimeConverter.TIME=value must be a time
@@ -59,10 +32,10 @@
 javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided
 javax.faces.converter.FloatConverter.FLOAT=value must be a number
 javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38
-javax.faces.converter.IntegerConverter.INTEGER=value must be an integer
-javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647
-javax.faces.converter.LongConverter.LONG=value must be an integer
-javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807
+javax.faces.converter.IntegerConverter.INTEGER=value must be a number
+javax.faces.converter.IntegerConverter.INTEGER_detail=value must be a number between -2147483648 and 2147483647
+javax.faces.converter.LongConverter.LONG=value must be a number
+javax.faces.converter.LongConverter.LONG_detail=must be a number between -9223372036854775808 and 9223372036854775807
 javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount
 javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1}
 javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount
@@ -71,20 +44,7 @@
 javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number
 javax.faces.converter.NumberConverter.PATTERN=value must be a number
 javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number
-javax.faces.converter.ShortConverter.SHORT=value must be an integer
-javax.faces.converter.ShortConverter.SHORT_detail=value must be an integer number between -32768 and 32767
+javax.faces.converter.ShortConverter.SHORT=value must be a number
+javax.faces.converter.ShortConverter.SHORT_detail=value must be a number between -32768 and 32767
 
-javax.faces.validator.DoubleRangeValidator.MAXIMUM=value must be less than or equal to {0}
-javax.faces.validator.DoubleRangeValidator.MINIMUM=value must be greater than or equal to {0}
-javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=value must be between {0} and {1}
-javax.faces.validator.DoubleRangeValidator.TYPE=value is not of the correct type
-javax.faces.validator.LengthValidator.MAXIMUM=value is must be shorter than or equal to {0} characters
-javax.faces.validator.LengthValidator.MINIMUM=value is must be longer than or equal to {0} characters
-javax.faces.validator.LongRangeValidator.MAXIMUM=value must be less than or equal to {0}
-javax.faces.validator.LongRangeValidator.MINIMUM=value must be greater than or equal to {0}
-javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=value must be between {0} and {1}
-javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type
 
-javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
-javax.faces.converter.STRING=value could not be converted to a string
-

Modified: portlets/src/framework/SeamBookingPortlet/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/pom.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/pom.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.seam</groupId>
       <artifactId>root</artifactId>
-      <version>2.0.0.CR2</version>
+      <version>2.0.0.GA</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.portal.example</groupId>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/resources/components.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/resources/components.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/resources/components.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -7,6 +7,7 @@
             xmlns:web="http://jboss.com/products/seam/web"
             xmlns:mail="http://jboss.com/products/seam/mail"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:transaction="http://jboss.com/products/seam/transaction"
             xsi:schemaLocation=
                     "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
                  http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
@@ -27,9 +28,9 @@
                                              persistence-unit-jndi-name="java:/seamtestappEntityManagerFactory"/>
 
 
+    <!--<transaction:ejb-transaction/>-->
+   
+    <security:identity authenticate-method="#{authenticator.authenticate}"/>
 
-    <security:identity authenticate-method="#{authenticator.authenticate}"
-                       jaas-config-name="test-policy" installed=""/>
-
   
 </components>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,65 +1,112 @@
-<!DOCTYPE pages PUBLIC
-          "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
-          "http://jboss.com/products/seam/pages-1.2.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<pages xmlns="http://jboss.com/products/seam/pages"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
 
-<pages no-conversation-view-id="/index.xhtml"
-                 login-view-id="/login.xhtml"
-      conversation-required="false">
+       no-conversation-view-id="/main.xhtml"
+                 login-view-id="/home.xhtml">
 
-    <!--<page view-id="*" action="#{stickyConversationManager.test}"  propagation="none"/>-->
+    <page view-id="/register.xhtml">
 
+        <action if="#{validation.failed}"
+           execute="#{register.invalid}"/>
 
+        <navigation>
+            <rule if="#{register.registered}">
+                <redirect view-id="/home.xhtml"/>
+            </rule>
+        </navigation>
 
+    </page>
 
+    <page view-id="/home.xhtml">
 
-   <exception class="java.util.EmptyStackException">
-        <redirect view-id="/index.xhtml">
-            <message>Error 777</message>
-        </redirect>
-    </exception>
+        <navigation>
+            <rule if="#{identity.loggedIn}">
+                <redirect view-id="/main.xhtml"/>
+            </rule>
+        </navigation>
 
-    <exception class="org.jboss.seam.framework.EntityNotFoundException">
-        <redirect view-id="/error.xhtml">
-            <message>Not found</message>
-        </redirect>
-    </exception>
+    </page>
 
+    <page view-id="/password.xhtml"
+          login-required="true">
 
-    <exception class="javax.persistence.NoResultException">
-        <redirect view-id="/error.xhtml">
-            <message>Dealer Not found</message>
-        </redirect>
-    </exception>
-    
-    <exception class="javax.persistence.EntityNotFoundException">
-        <redirect view-id="/error.xhtml">
-            <message>Not found</message>
-        </redirect>
-    </exception>
-    
-    <exception class="javax.persistence.OptimisticLockException">
-        <end-conversation/>
-        <redirect view-id="/error.xhtml">
-            <message>Another user changed the same data, please try again</message>
-        </redirect>
-    </exception>
-    
-    <exception class="org.jboss.seam.security.AuthorizationException">
-        <redirect>
-            <message>You don't have permission to do this</message>
-        </redirect>
-    </exception>
-    
+        <navigation>
+            <rule if="#{changePassword.changed}">
+                <redirect view-id="/main.xhtml"/>
+            </rule>
+        </navigation>
+
+    </page>
+
+    <page view-id="/main.xhtml"
+          login-required="true">
+
+        <navigation from-action="#{hotelBooking.selectHotel(hot)}">
+            <redirect view-id="/hotel.xhtml"/>
+        </navigation>
+
+        <navigation from-action="#{bookingList.cancel}">
+            <redirect/>
+        </navigation>
+
+    </page>
+
+	<page view-id="/hotel.xhtml"
+	      conversation-required="true"
+	      login-required="true">
+
+        <description>View hotel: #{hotel.name}</description>
+
+        <navigation from-action="#{hotelBooking.bookHotel}">
+            <redirect view-id="/book.xhtml"/>
+        </navigation>
+
+    </page>
+
+	<page view-id="/book.xhtml"
+	      conversation-required="true"
+	      login-required="true">
+
+        <description>Book hotel: #{hotel.name}</description>
+
+        <navigation from-action="#{hotelBooking.setBookingDetails}">
+            <rule if="#{hotelBooking.bookingValid}">
+                <redirect view-id="/confirm.xhtml"/>
+            </rule>
+        </navigation>
+
+    </page>
+
+	<page view-id="/confirm.xhtml"
+	      conversation-required="true"
+	      login-required="true">
+
+        <description>Confirm booking: #{booking.description}</description>
+
+        <navigation from-action="#{hotelBooking.confirm}">
+            <redirect view-id="/main.xhtml"/>
+        </navigation>
+
+    </page>
+
+    <page view-id="*">
+
+        <navigation from-action="#{identity.logout}">
+            <redirect view-id="/home.xhtml"/>
+        </navigation>
+
+        <navigation from-action="#{hotelBooking.cancel}">
+            <redirect view-id="/main.xhtml"/>
+        </navigation>
+
+    </page>
+
     <exception class="org.jboss.seam.security.NotLoggedInException">
-        <redirect view-id="/admin/login.xhtml">
-            <message>Please log in first</message>
+        <redirect view-id="/home.xhtml">
+            <message severity="warn">You must be logged in to use this feature</message>
         </redirect>
     </exception>
-     
-    <exception>
-        <redirect view-id="/error.xhtml">
-            <message>Unexpected error, please try again</message>
-        </redirect>
-    </exception>
-    
-</pages>
\ No newline at end of file
+
+</pages>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml	2007-11-12 20:01:02 UTC (rev 148)
@@ -34,7 +34,7 @@
       <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
    </listener>
 
-<!--
+
    <servlet>
       <servlet-name>Seam Resource Servlet</servlet-name>
       <servlet-class>org.jboss.seam.servlet.ResourceServlet</servlet-class>
@@ -44,8 +44,8 @@
       <servlet-name>Seam Resource Servlet</servlet-name>
       <url-pattern>/seam/resource/*</url-pattern>
    </servlet-mapping>
--->
 
+
    <filter>
       <filter-name>Seam Filter</filter-name>
       <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,122 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			xmlns:h="http://java.sun.com/jsf/html"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:s="http://jboss.com/products/seam/taglib"
+                xmlns:a="http://richfaces.org/a4j"
+                xmlns:rich="http://richfaces.org/rich"
+				template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+<div class="section">
+	<h1>Book Hotel</h1>
+</div>
+<div class="section">
+	<div class="entry errors">
+		<h:messages globalOnly="true"/>
+	</div>
+
+	<ui:include src="hotelview.xhtml"/>
+	
+	<div style="clear:both"/>
+
+	<h:form id="booking">
+	<fieldset>
+			
+		<s:decorate id="checkinDateDecorate" template="edit.xhtml">
+			<ui:define name="label">Check In Date:</ui:define>
+			<rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" />
+		</s:decorate>
+		
+		<s:decorate id="checkoutDateDecorate" template="edit.xhtml">
+			<ui:define name="label">Check Out Date:</ui:define>
+			<rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" />
+		</s:decorate>
+		
+		<s:decorate id="bedsDecorate" template="edit.xhtml">
+			<ui:define name="label">Room Preference:</ui:define>
+			<h:selectOneMenu id="beds" value="#{booking.beds}">
+				<f:selectItem itemLabel="One king-size bed" itemValue="1"/>
+				<f:selectItem itemLabel="Two double beds" itemValue="2"/>
+				<f:selectItem itemLabel="Three beds" itemValue="3"/>
+			</h:selectOneMenu>
+		</s:decorate>
+		
+		<s:decorate id="smokingDecorate" template="edit.xhtml">
+			<ui:define name="label">Smoking Preference:</ui:define>
+			<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection" styleClass="radio">
+				<f:selectItem itemLabel="Smoking" itemValue="true"/>
+				<f:selectItem itemLabel="Non Smoking" itemValue="false"/>
+			</h:selectOneRadio>
+		</s:decorate>
+
+		<s:decorate id="creditCardDecorate" template="edit.xhtml">
+			<ui:define name="label">Credit Card #:</ui:define>
+			<h:inputText id="creditCard" value="#{booking.creditCard}" required="true">
+				<a:support event="onblur" reRender="creditCardDecorate"/>
+			</h:inputText>
+		</s:decorate>
+
+		<s:decorate id="creditCardNameDecorate" template="edit.xhtml">
+			<ui:define name="label">Credit Card Name:</ui:define>
+			<h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true">
+				<a:support event="onblur" reRender="creditCardNameDecorate"/>
+			</h:inputText>
+		</s:decorate>
+
+		<s:decorate id="creditCardExpiryDecorate" template="edit.xhtml">
+			<ui:define name="label">Credit Card Expiry:</ui:define>
+			<h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}">
+				<f:selectItem itemLabel="Jan" itemValue="1"/>
+				<f:selectItem itemLabel="Feb" itemValue="2"/>
+				<f:selectItem itemLabel="Mar" itemValue="3"/>
+				<f:selectItem itemLabel="Apr" itemValue="4"/>
+				<f:selectItem itemLabel="May" itemValue="5"/>
+				<f:selectItem itemLabel="Jun" itemValue="6"/>
+				<f:selectItem itemLabel="Jul" itemValue="7"/>
+				<f:selectItem itemLabel="Aug" itemValue="8"/>
+				<f:selectItem itemLabel="Sep" itemValue="9"/>
+				<f:selectItem itemLabel="Oct" itemValue="10"/>
+				<f:selectItem itemLabel="Nov" itemValue="11"/>
+				<f:selectItem itemLabel="Dec" itemValue="12"/>
+			</h:selectOneMenu>
+			<h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}">
+				<f:selectItem itemLabel="2005" itemValue="2005"/>
+				<f:selectItem itemLabel="2006" itemValue="2006"/>
+				<f:selectItem itemLabel="2007" itemValue="2007"/>
+				<f:selectItem itemLabel="2008" itemValue="2008"/>
+				<f:selectItem itemLabel="2009" itemValue="2009"/>
+			</h:selectOneMenu>
+		</s:decorate>
+		
+		<div class="buttonBox">
+			<h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
+			&#160;
+			<s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
+		</div>
+		
+	</fieldset>
+	</h:form>
+</div>
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+
+<h1>Workspace management</h1>
+<p>
+   As you can see, Seam makes it easy to work in multiple windows or multiple browser 
+   tabs. But you can even switch between multiple tasks inside a single browser tab!
+   The "Workspaces" section showcases this advanced feature.
+</p>
+<p>
+   <a href="#" onclick="window.open('exp/workspaceExp.html','exp','width=752,height=500,scrollbars=yes');">
+	  How does the workspace list work?
+   </a>
+</p>
+
+</ui:define>
+
+</ui:composition>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,74 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			xmlns:h="http://java.sun.com/jsf/html"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:s="http://jboss.com/products/seam/taglib"
+				template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+
+<div class="section">
+	<h1>Confirm Hotel Booking</h1>
+</div>
+
+<div class="section">
+
+	<ui:include src="hotelview.xhtml"/>
+		
+	<s:decorate template="display.xhtml">
+		<ui:define name="label">Total Payment:</ui:define>
+		<h:outputText value="#{booking.total}">
+			<f:convertNumber type="currency" currencySymbol="$"/>
+		</h:outputText>
+	</s:decorate>
+
+	<s:decorate template="display.xhtml">
+		<ui:define name="label">Check In Date:</ui:define>
+		<h:outputText value="#{booking.checkinDate}"/>
+	</s:decorate>
+
+	<s:decorate template="display.xhtml">
+		<ui:define name="label">Check Out Date:</ui:define>
+		<h:outputText value="#{booking.checkoutDate}"/>
+	</s:decorate>
+
+	<s:decorate template="display.xhtml">
+		<ui:define name="label">Credit Card #:</ui:define>
+		#{booking.creditCard}
+	</s:decorate>
+	
+	<div class="buttonBox">
+		<h:form id="confirm">
+			<h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>
+			&#160;
+    		<s:button id="revise" value="Revise" view="/book.xhtml"/>
+    		&#160;
+    		<h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
+		</h:form>
+	</div>
+
+</div>
+
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+<h1>Back button navigation</h1>
+<p>
+   When you click "Confirm", the new booking is written to the database, the 
+   conversation ends, and state associated with the conversation is automatically 
+   destroyed by Seam. After you confirm your booking, try hitting the back button
+   on your web browser and clicking "Confirm" again. Seam makes it easy implement
+   applications that behave elegantly in response to the back, forward and refresh
+   buttons.
+</p>
+<p>
+   <a href="#" onclick="window.open('exp/confirmExp.html','exp','width=752,height=500,scrollbars=yes');">
+      What happens when the conversation ends?
+   </a>
+</p>
+</ui:define>
+
+</ui:composition>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,36 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:c="http://java.sun.com/jstl/core"
+     xmlns:ui="http://java.sun.com/jsf/facelets"
+     xmlns:f="http://java.sun.com/jsf/core"
+     xmlns:h="http://java.sun.com/jsf/html"
+     xmlns:s="http://jboss.com/products/seam/taglib">
+	<div>
+	     
+	<div class="section">
+	    <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1>
+	</div>
+	
+	<div class="section">
+	    <h:form>
+	        <h:dataTable value="#{conversationList}" var="entry">
+	            <h:column>
+	                <h:commandLink action="#{entry.select}" value="#{entry.description}"/>
+	                &#160;
+	                <h:outputText value="[current]" rendered="#{entry.current}"/>
+	            </h:column>
+	            <h:column>
+	                <h:outputText value="#{entry.startDatetime}">
+	                    <s:convertDateTime type="time" pattern="hh:mm"/>
+	                </h:outputText>
+	                -
+	                <h:outputText value="#{entry.lastDatetime}">
+	                    <s:convertDateTime type="time" pattern="hh:mm"/>
+	                </h:outputText>
+	            </h:column>
+	        </h:dataTable>
+	    </h:form>
+	</div>
+	
+	</div>
+</ui:composition>
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,274 @@
+/* Setup defaults since variable in browsers
+----------------------------------------------- */
+body, div, span, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset {
+	margin: 0;
+	padding: 0;
+}
+/* Element Defaults
+----------------------------------------------- */
+html {
+	height: 100%;
+	background-color: #DBD4C6;
+}
+img {
+	border: 0;
+}
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: small;
+	line-height: 1.25em;
+	color: #362F2D;
+	position: relative;
+	width: 760px;
+	height: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+.label {
+	font-weight: bold;
+	color: #5E5147;
+}
+input {
+	border: 1px solid #C3BBB6;
+	padding: 4px;
+	margin: 5px 0;
+	background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
+}
+select {
+	border: 1px solid #C3BBB6;
+	padding: 4px;
+	margin: 5px 0;
+	background: #fff url(../img/input.bg.gif) 0 0 repeat-x;
+}
+ol, ul {
+	margin: 10px 0px 10px 6px;
+}
+li {
+	margin: 10px 12px;
+}
+fieldset {
+	border: 0;
+}
+/* Layout
+----------------------------------------------- */
+#document {
+	padding: 0 1px;
+	background: #fff url(../img/bg.gif) 0 0 repeat-y;
+	float: left;
+	border-bottom: 1px solid #C3BBB6;
+}
+#header {
+	float: left;
+	width: 758px;
+	height: 46px;
+	background: url(../img/hdr.bg.gif) 0 0 repeat-x;
+}
+#container {
+	float: left;
+	width: 758px;
+	background: url(../img/hdr.bar.jpg) 0 0 repeat-x;
+}
+#sidebar {
+	float: left;
+	width: 190px;
+	margin-top: 96px;
+	padding: 20px 10px 0 10px;
+	background: url(../img/sdb.bg.gif) 0 0 no-repeat;
+}
+#content {
+	float: left;
+	width: 548px;
+	margin-top: 75px;
+	padding-top: 5px;
+	background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x;
+}
+#footer {
+	clear: both;
+	margin-top: 40px;
+	float: left;
+	padding: 20px;
+	border-top: 1px solid #C3BBB6;
+	background-color: #fff;
+	width: 718px;
+	text-align: right;
+}
+/* General
+----------------------------------------------- */
+input[type="submit"], input[type="button"] {
+	font-weight: bold;
+	color: #fff;
+	border: 1px solid #5D1414;
+	height: 26px;
+	background: #fff url(../img/btn.bg.gif) 0 0 repeat-x;
+	border-style: none;
+}
+.center {
+	text-align: center;
+}
+.entry {
+	clear: both;
+	padding-top: 10px;
+}
+.entry .label {
+	float: left;
+	padding-right: 5px;
+	font-weight: bold;
+	width: 150px;
+	text-align: right;
+}
+.entry .output {
+	float: right;
+	width: 360px;
+	padding-top: 10px;
+	text-align: left;
+}
+.entry .input {
+	float: right;
+	width: 360px;
+	text-align: left;
+}
+.entry .error {
+	float: right;
+	width: 360px;
+	text-align: left;
+}
+/* Sidebar
+----------------------------------------------- */
+.notes {
+	text-align: center;
+	font-size: small;
+}
+.errors {
+	font-size: small;
+	font-weight: bold;
+	text-align: center;
+	color: #600;
+}
+.errors div {
+	text-align: left;
+}
+.errors span {
+	text-align: left;
+}
+.errors input {
+	border: 1px solid #600;
+}
+.errors ul {
+	list-style: none;
+}
+.buttonBox {
+	text-align: center;
+	padding: 5px 0;
+	clear: both;
+}
+#sidebar p {
+	font-size: small;
+	color: #8B7869;
+	line-height: 150%;
+	padding-bottom: 10px;
+}
+#sidebar li {
+	font-size: small;
+	color: #8B7869;
+}
+#sidebar h1 {
+	line-height: normal;
+	font-weight: bold;
+	font-size: small;
+}
+/*
+#sidebar p:hover {
+	color: #362F2D;
+}
+*/
+/* Content
+----------------------------------------------- */
+#content .section {
+	float: left;
+	width: 518px;
+	padding: 15px 15px 0 15px;
+}
+#content .section h1 {
+	font-family: "Trebuchet MS", Arial, sans-serif;
+	line-height: normal;
+	font-weight: normal;
+	font-size: large;
+}
+#content .section p {
+	line-height: 150%;
+	padding: 10px 0;
+	font-size: small;
+}
+#content table {
+	width: 100%;
+	border: 1px solid #D2C9C4;
+	border-collapse: collapse;
+}
+#content table caption {
+	padding-bottom: 6px;
+	text-align: left;
+	font-weight: bold;
+}
+#content table thead th {
+	border-left: 1px solid #D2C9C4;
+	background: #fff url(../img/th.bg.gif) 0 100% repeat-x;	
+	border-bottom: 1px solid #D2C9C4;
+	padding: 6px;
+	text-align: left;
+	font-size: small;
+}
+#content table tbody td {
+	border-left: 1px solid #E4DBD5;
+	padding: 4px;
+	border-bottom: 1px solid #D2C9C4;
+	font-size: small;
+}
+#content dt {
+	font-weight: bold;
+	float: left;
+	width: 33%;
+}
+#content dd {
+	padding-left: 10px;
+	float: left;
+	width: 66%;
+}
+#content table.radio {
+	border: 0px;
+}
+#content table.radio tbody tr td {
+	border: 0px;
+	border-left: 0px;
+	border-bottom: 0px;
+}
+/* Header
+----------------------------------------------- */
+#title {
+	float: left;
+	padding: 1px 0 6px 15px;
+}
+#status {
+	color: #C7B299;
+	float: right;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	font-size: x-small;
+	text-align: right;
+	padding-top: 14px;
+	padding-right: 15px;
+}
+#status a {
+	color: #C7B299;
+	text-decoration: none;
+}
+/* Homepage Modifications
+----------------------------------------------- */
+#pgHome #container {
+	background: url(../img/hdr.ad.jpg) 0 0 repeat-x;
+}
+#pgHome #sidebar {
+	margin-top: 207px;
+}
+#pgHome #content {
+	margin-top: 183px;
+}

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/trailblazer_main.css
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/trailblazer_main.css	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/trailblazer_main.css	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,148 @@
+* {
+    margin:  0px; 
+    padding: 0px; 
+    border:  none;
+}
+
+body {
+    font: 1em verdana, arial, sans-serif;
+    background: #CCCCCC;
+}
+
+div#main {
+    margin-left:  0px;
+    width: 751px;
+    background: #ecefdf;
+}
+
+div#top,div#pictures{
+}
+
+div#pictures img {
+    float:left;
+}
+
+img#head1 {
+    margin-right: 3px;
+} 
+
+img#head2 {
+    margin-right: 4px;
+} 
+
+div.trail {
+    clear:both;     
+    margin-left:  50px;
+    margin-top:   0px;
+    margin-right: 50px
+}
+
+div.foot {
+    margin-left:  50px;
+    margin-right: 50px;
+    margin-top:   50px;
+    text-align:   center;
+    font-size:    .5em;
+    height: 36px;
+}
+
+div.trail h1 {
+    margin-top:   -30px;
+    margin-left:  -50px;
+    font-size:    1.2em;   
+    font-weight:  bold;
+    padding-left: .4em;
+}
+
+div.trail h2 { 
+    float:        left;
+    font-size:    1em;   
+    font-weight:  bold;
+    padding-left: .4em;
+}
+
+div.trail h3 { 
+    float:        left;
+    font-size:    .8em;   
+    font-weight:  bold;
+    margin-left: -1.4em;
+    margin-bottom: 1em;
+}
+
+
+div.trail p {
+    clear:      both;
+    margin-top: 20px;
+    font-size: .8em;
+    text-decoration: none;
+}
+
+div#next_trail {
+    margin-left: 36px;
+}
+
+div.numbox {
+    border: thin solid black; 
+    margin-left: -.8em;
+    float:   left;
+    background: #ffffff;
+    padding: .2em .35em .3em;
+    font-style: normal;
+    font-weight: bold;
+    font-size: 1.4em;
+}
+
+div.figure {
+    text-align: center;
+    font-size: .6em;
+    margin-top: 30px;
+}
+
+div.figure img {
+    display: block;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+code {
+    font: 1.1em "Courier New", Courier, mono;
+}
+
+code.block {
+    white-space: pre;
+    font: 10pt "Courier New", Courier, mono;
+    display: block;
+    border-style: dashed;
+    border-width: thin;
+    padding: .5em;
+    background: #ffffff;
+    margin: 20px;
+}
+
+div.foot_image {
+   float: left;
+   height: 86px;
+}
+
+a:active {
+    color : #666666;
+    text-decoration: none;
+}
+
+a:hover {
+    color : #000000;
+    background-color : #D6E0FE;
+    text-decoration: none;
+}
+
+a:link {
+    color : #005EB6;
+    text-decoration: none;
+}
+
+a:visited {
+    color : #888888;
+    text-decoration: none;
+}
+
+

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/display.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/display.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/display.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,16 @@
+<ui:composition  xmlns="http://www.w3.org/1999/xhtml"
+                 xmlns:ui="http://java.sun.com/jsf/facelets"
+                 xmlns:h="http://java.sun.com/jsf/html"
+                 xmlns:f="http://java.sun.com/jsf/core"
+                 xmlns:s="http://jboss.com/products/seam/taglib">
+                 
+    <div class="entry">
+        <span class="label">
+            <ui:insert name="label"/>
+        </span>
+        <span class="input">
+            <ui:insert/>
+        </span>
+    </div>
+    
+</ui:composition>
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/edit.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/edit.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/edit.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,21 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:s="http://jboss.com/products/seam/taglib">
+                 
+    <div class="entry">
+        <s:label styleClass="label #{invalid?'errors':''}">
+            <ui:insert name="label"/>
+            <s:span styleClass="required" rendered="#{required}">*</s:span>
+        </s:label>
+        <span class="input #{invalid?'errors':''}">
+            <s:validateAll>
+                <ui:insert/>
+            </s:validateAll>
+        </span>
+        <s:message styleClass="error errors"/>
+    </div>
+    
+</ui:composition>
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">5</div>
+    <h2>Conversations</h2>
+    <img src="../img/header_line.gif" />
+    
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+    <p>
+       The hotel booking "wizard" is implemented by a conversation-scoped
+       stateful session bean. All Seam components are in the 
+       conversation scope by default. 
+       The <code>HotelBookingAction</code> maintains
+       state associated with the booking process in the Seam conversation
+       scope. This ensures that if the user is working in multiple brower
+       tabs or multiple brower windows, the various conversations are
+       completely isolated from each other.
+    </p>
+    <p>
+       To see this working in practice, right click on the "View Hotel" button 
+       in the search screen and select "open in new tab" or "open in new window",
+       and try working on multiple hotel bookings simultaneously. 
+       In the <a href="workspaceExp.html">next step</a>, we will discuss
+       Seam's built-in components to manage multiple concurrent conversations.
+    </p>
+    
+<code class="block">
+ at Stateful
+ at Name("hotelBooking")
+ at LoggedIn
+public class HotelBookingAction implements HotelBooking
+{
+   
+   @PersistenceContext(type=EXTENDED)
+   private EntityManager em;
+   
+   @In
+   private User user;
+   
+   @In(required=false) @Out
+   private Hotel hotel;
+   
+   @In(required=false) 
+   @Out(required=false)
+   private Booking booking;
+   
+   @In(create=true)
+   private FacesMessages facesMessages;
+      
+   @In(create=true)
+   private Events events;
+      
+   @In 
+   private HotelSearching hotelSearch;
+   
+   @Logger 
+   private Log log;
+   
+   private boolean bookingValid;
+   
+   @Begin
+   public void selectHotel(Hotel selectedHotel)
+   {
+      hotel = em.merge(selectedHotel);
+   }
+   
+   public void bookHotel()
+   {      
+      booking = new Booking(hotel, user);
+      Calendar calendar = Calendar.getInstance();
+      booking.setCheckinDate( calendar.getTime() );
+      calendar.add(Calendar.DAY_OF_MONTH, 1);
+      booking.setCheckoutDate( calendar.getTime() );
+   }
+   
+
+   public void setBookingDetails()
+   {
+      Calendar calendar = Calendar.getInstance();
+      calendar.add(Calendar.DAY_OF_MONTH, -1);
+      if ( booking.getCheckinDate().before( calendar.getTime() ) )
+      {
+         facesMessages.addToControl("checkinDate", "Check in date must be a future date");
+         bookingValid=false;
+      }
+      else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) )
+      {
+         facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date");
+         bookingValid=false;
+      }
+      else
+      {
+         bookingValid=true;
+      }
+   }
+   
+   public boolean isBookingValid()
+   {
+      return bookingValid;
+   }
+   
+   @End
+   public void confirm()
+   {
+      em.persist(booking);
+      facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}");
+      log.info("New booking: #{booking.id} for #{user.username}");
+      events.raiseTransactionSuccessEvent("bookingConfirmed");
+   }
+   
+   @End
+   public void cancel() {}
+   
+   @Remove
+   public void destroy() {}
+}</code>
+
+    <p>
+       The conversation begins when the <code>@Begin</code> annotated
+       <code>selectHotel()</code> is called, and ends when 
+       the <code>@End</code> annotated 
+       <code>confirm()</code> or <code>cancel()</code> is called. Between the
+       <code>@Begin</code> and <code>@End</code> methods, the user can do
+       any number of things with the application (i.e., invoke any 
+       event handler method or use the BACK button etc.) and the 
+       <code>hotelBooking</code> maintains its state throughout the process.
+       When the <code>@End</code> method is called, Seam destroys this
+       component and avoids any memory leak.
+    </p>
+    
+    <p>
+      However, none of the <code>HotelBookingAction</code> bean methods 
+      may be called outside of a long-running conversation. 
+      So if we try to use the 
+      back button after the end of the conversation, Seam will redirect to the main page, with an 
+      error message.
+   </p>
+
+
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">7</div>
+    <h2>Ending Conversations</h2>
+    <img src="../img/header_line.gif" />
+    
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+    <p>
+       The "Confirm" button is bound to the action method <code>confirm()</code>
+       of <code>HotelBookingAction</code>.
+    </p>
+
+<code class="block">
+&lt;h:commandButton value="Confirm" 
+                 action="#{hotelBooking.confirm}" 
+                 id="confirm"/&gt;
+</code>
+
+    <p>
+       The <code>confirm()</code> method is tagged with the <code>@End</code> annotation, 
+       which ends the long-running conversation and results in all state associated with
+       the conversation being destroyed at the end of the request. 
+       Since the <code>pages.xml</code> file specifies a redirect for this action, the state
+        will not be destroyed
+       until <em>after the redirect completes</em>. Note that even the success message
+       that we create using the built-in <code>facesMessages</code> component is transparently
+       propagated across the redirect!
+    </p>
+
+<code class="block">
+   @End
+   public void confirm()
+   {
+      if (booking==null || hotel==null) return "main";
+      em.persist(booking);
+      facesMessages.add("Thank you, #{user.name}, your confimation number " + 
+                        "for #{hotel.name} is #{booking.id}");
+      log.info("New booking: #{booking.id} for #{user.username}");
+      events.raiseEvent("bookingConfirmed");
+   }
+   
+   @End
+   public void cancel() {}
+   
+   @Destroy @Remove
+   public void destroy() {}
+}
+</code>
+
+   <p>
+      When the conversation state is finally destroyed, Seam calls the <code>@Destroy</code> method,
+      which results in removal of the SFSB.
+   </p>
+   
+   <p>
+      Notice that the <code>HotelBookingAction.confirm()</code> method
+      raises a <code>bookingConfirmed</code> event before it finishes. The
+      event mechanism allows Seam components to communicate with each other
+      without direct coupling. In this case, the <code>BookingListAction</code>
+      component captures the <code>bookingConfirmed</code> event and refreshes
+      the existing booking list for the current user.
+   </p>
+   
+<code class="block">
+public class BookingListAction implements BookingList, Serializable
+{
+
+   ... ...
+   
+   @Factory
+   @Observer("bookingConfirmed")
+   public void getBookings()
+   {
+      bookings = em.createQuery("from Booking b where b.user.username = " + 
+                                ":username order by b.checkinDate")
+            .setParameter("username", user.getUsername())
+            .getResultList();
+   }
+}
+</code>
+   
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">1</div>
+    <h2>What is JBoss Seam</h2>
+    <img src="../img/header_line.gif" />
+    
+    <p>
+       <center>
+       <form>
+          <INPUT type="button" value="Close Window" onclick="window.close()">
+       </form>
+       </center>
+    </p>
+    
+    <p>
+       EJB 3.0 and JSF are perhaps the most exciting new developments in the Java EE 5 platform. 
+       Seam is an innovative new application framework that integrates the EJB 3.0 component model 
+       with JSF as a presentation tier. Seam builds upon the standard extension points provided by 
+       both specifications and provides a set of Java annotations that extends the standard 
+       annotations defined by the EJB specification. In addition, Seam introduces several innovative 
+       new ideas: managed conversations, declarative and contextual application state management, 
+       bijection and integrated business process management. 
+    </p>
+
+    <p>
+       Traditional web applications are incredibly vulnerable to bugs and performance problems 
+       relating to state management. Developers are forced to handle issues like back button 
+       navigation, multi-window browsing, session size management in an utterly ad-hoc fashion. 
+       Access to transactional components from the web tier has also been problematic. J2EE 
+       provided no way to have simultaneous access to state held in contexts associated with 
+       the web request, and state held in transactional resources accessed via EJB. Finally, 
+       J2EE had no first-class construct for representing state associated with a long-running 
+       business process. Seam tackles all these problems, and provides a uniform model for 
+       stateful components in Java EE 5.
+    </p>
+				
+    <p>
+       Like all JBoss software, this entire software stack is free. The full source code of this 
+       sample application is available in the <code>examples/booking</code> directory of the 
+       <a href="http://www.jboss.com/products/list/downloads#seam">Seam distribution</a>. 
+       <!--
+       There is even a  
+       <a target="_blank" href="http://docs.jboss.com/TrailBlazer/seam-booking/Seam.htm">
+          10-minute flash demo 
+       </a>
+       showing how to build a Seam web application from ground up.
+       -->
+    </p>
+
+    <p>
+       <center>
+       <form>
+          <INPUT type="button" value="Close Window" onclick="window.close()">
+       </form>
+       </center>
+    </p>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">2</div>
+    <h2>What happens when you login?</h2>
+    <img src="../img/header_line.gif" />
+    
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+    
+    <p>
+       The login page is defined using pure XHTML with JSF controls. 
+       The form uses JSF EL value binding and method binding 
+       expressions to refer to Seam components. For example, 
+       <code>#{identity.username}</code> refers to a property of the
+       <code>Identity</code> component and <code>#{identity.login}</code> 
+       refers to a method of the <code>Identity</code> component.
+    </p>
+
+<code class="block">
+&lt;div&gt;
+    &lt;h:outputLabel for="username">Login Name&lt;/h:outputLabel>
+    &lt;h:inputText id="username" value="#{identity.username}" />
+&lt;/div&gt;
+&lt;div&gt;
+    &lt;h:outputLabel for="password">Password&lt;/h:outputLabel>
+    &lt;h:inputSecret id="password" value="#{identity.password}" />
+&lt;/div&gt;
+
+... ...
+
+&lt;div class="buttonBox"&gt;
+    &lt;h:commandButton id="login"
+                     action="#{identity.login}" 
+                     value="Account Login" /&gt;
+&lt;/div&gt;
+</code>
+
+    <p>
+       After logging in, the <code>User</code> enity bean is mapped to the Seam  
+       context variable named <code>user</code> bean via the 
+       <code>@Name</code> annotation. <code>User</code> is
+       a session scoped bean, meaning that the <code>user</code>
+       component value is retained for the entire session for
+       each user. You might also notice there are validation annotation
+       on the data properties. We will discuss those annotations in the
+       <a href="registerExp.html">next step</a>.
+    </p>
+
+<code class="block">
+ at Entity
+ at Name("user")
+ at Scope(SESSION)
+public class User implements Serializable {
+   private String username;
+   private String password;
+   private String name;
+
+   @NotNull
+   @Length(min=5, max=15)
+   public String getPassword() {
+      return password;
+   }
+   public void setPassword(String password) {
+      this.password = password;
+   }
+   
+
+   @Id
+   @Length(min=4, max=15)
+   @Pattern(regex="^\\w*$", message="not a valid username")
+   public String getUsername () {
+      return username;
+   }
+   public void setUsername (String username) {
+      this.username = username;
+   }
+
+    // ... ...
+}
+</code>
+
+    <p>
+       Seam comes with its own Security framework, based on JAAS.  It allows you 
+       to perform user authentication by configuring your own authentication method
+       in <code>components.xml</code>.
+    </p>
+    
+<code class="block">
+  &lt;security:identity authenticate-method="#{authenticator.authenticate}"/&gt;
+</code>
+
+    <p>
+       <code>AuthenticatorAction</code> is an EJB 3.0 session bean mapped 
+       to the Seam context variable named <code>authenticator</code>. When 
+       the login button is clicked, the JSF method binding 
+       <code>#{identity.login}</code> is evaluated, and based upon the previous configuration, the 
+       <code>authenticate()</code> method is invoked upon <code>AuthenticatorAction</code>.
+    </p>
+
+<code class="block">
+ at Stateless
+ at Scope(EVENT)
+ at Name("authenticator")
+public class AuthenticatorAction implements Authenticator
+{
+   @PersistenceContext 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;
+      }
+   }
+}
+</code>
+
+    <p>
+       The <code>@Out</code> 
+       annotation indicates the <code>AuthenticatorAction</code> bean can change the
+       value of the <code>user</code> context variable and make the new instance 
+       available to other session beans and JSF pages.  The query expression 
+       makes use of a special syntax in Seam that allows EL expressions to 
+       serve as query parameters.  This query references the <code>identity</code> component,
+       a built-in Seam component that provides security functionality.
+    </p>
+
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,214 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">4</div>
+    <h2>Stateful components</h2>
+    <img src="../img/header_line.gif" />
+    
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+    <p>
+       The hotel search page is backed by the a stateful session bean named
+       <code>hotelSearch</code> and implemented by the class 
+       <code>HotelSearchingAction</code>.
+    </p>
+
+<code class="block">
+&lt;h:inputText id="searchString" value="#{hotelSearch.searchString}" &gt;
+    &lt;a:support event="onkeyup" actionListener="#{hotelSearch.find}" 
+               reRender="searchResults"/&gt;
+&lt;/h:inputText&gt;
+
+&lt;h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"&gt;
+    &lt;f:selectItem itemLabel="5" itemValue="5"/&gt;
+    &lt;f:selectItem itemLabel="10" itemValue="10"/&gt;
+    &lt;f::selectItem itemLabel="20" itemValue="20"/&gt;
+&lt;/h:selectOneMenu&gt;
+</code>
+
+    <p>
+       When the button is clicked, the form is submitted and JSF sets the value 
+       of the text box and drop down menu onto the <code>searchString</code> and
+       <code>pageSize</code> attributes of <code>HotelSearchingAction</code> 
+       before calling the <code>find()</code> action listener method. We've used a 
+       session-scope stateful bean because we want it's state (the search results) to 
+       be held in the session between requests to the server.  The <code>&lt;a:support&gt;</code>
+       tax specfies that after a keypress, the contents of the <code>&lt;a:outputPanel&gt;</code> whose
+       id is <code>searchResults</code> should be rerendererd.  This is done through an AJAX-style
+       call back to the server with no additional code required of the application.
+    </p>
+
+<code class="block">
+ at Stateful
+ at Name("hotelSearch")
+ at Scope(ScopeType.SESSION)
+ at LoggedIn
+public class HotelSearchingAction implements HotelSearching
+{
+   @PersistenceContext
+   private EntityManager em;
+   
+   private String searchString;
+   private int pageSize = 10;
+   private int page;
+   
+   @DataModel
+   private List&lt;Hotel&gt; hotels;
+   
+   public void find()
+   {
+      page = 0;
+      queryHotels();
+   }
+   public void nextPage()
+   {
+      page++;
+      queryHotels();
+   }
+      
+   private void queryHotels()
+   {
+      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();
+   }
+   
+   public boolean isNextPageAvailable()
+   {
+      return hotels!=null && hotels.size()==pageSize;
+   }
+   
+   public int getPageSize() {
+      return pageSize;
+   }
+   
+   public void setPageSize(int pageSize) {
+      this.pageSize = pageSize;
+   }
+   
+   @Factory(value="pattern", scope=ScopeType.EVENT)
+   public String getSearchPattern()
+   {
+      return searchString==null ? 
+            "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
+   }
+   
+   public String getSearchString()
+   {
+      return searchString;
+   }
+   
+   public void setSearchString(String searchString)
+   {
+      this.searchString = searchString;
+   }
+   
+   @Remove
+   public void destroy() {}
+}</code>
+
+    <p>
+       The <code>find()</code> method retrieves a list of hotels from the database and
+       initializes the <code>hotels</code> field. The <code>hotels</code> field is marked 
+       with the <code>@DataModel</code> annotation, so when the <code>find()</code> method
+       returns, Seam outjects an instance of <code>ListDataModel</code> to a context
+       variable named <code>hotels</code>. So, when the search page is re-rendered, the
+       result list is available to the JSF <code>dataTable</code>. 
+       Each row of the data table has an associated command button or link 
+       (see below). 
+    </p>
+
+<code class="block">
+&lt;h:outputText value="No Hotels Found" 
+              rendered="#{hotels != null and hotels.rowCount==0}"/&gt;
+&lt;h:dataTable value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"&gt;
+	&lt;h:column&gt;
+		&lt;f:facet name="header"&gt;Name&lt;/f:facet&gt;
+		#{hot.name}
+	&lt;/h:column&gt;
+	&lt;h:column&gt;
+		&lt;f:facet name="header"&gt;Address&lt;/f:facet&gt;
+		#{hot.address}
+	&lt;/h:column&gt;
+	&lt;h:column&gt;
+		&lt;f:facet name="header"&gt;City, State&lt;/f:facet&gt;
+		#{hot.city}, #{hot.state}
+	&lt;/h:column&gt;
+	&lt;h:column&gt;
+		&lt;f:facet name="header"&gt;Zip&lt;/f:facet&gt;
+		#{hot.zip}
+	&lt;/h:column&gt;
+	&lt;h:column&gt;
+		&lt;f:facet name="header"&gt;Action&lt;/f:facet&gt;
+		&lt;s:link value="View Hotel" 
+                        action="#{hotelBooking.selectHotel(hot)}"/&gt;
+	&lt;/h:column&gt;
+&lt;/h:dataTable&gt;
+</code>
+
+    <p>
+       The "View Hotel" link is the above mentioned command link associated
+       with each row of the data table. It is implemented 
+       using a Seam <code>&lt;s:link&gt;</code>, which is part of Seam's 
+       extension of JSF controls.
+       This JSF control let's us call an action, and pass a request parameter, without 
+       submitting any JSF form. The advantage of <code>&lt;s:link&gt;</code> is that, 
+       unlike a standard JSF <code>&lt;h:commandLink&gt;</code>, there is no JavaScript 
+       used, so "open link in new tab" works seamlessly.
+    </p>
+    <p>
+       When this link is clicked, the <code>selectHotel()</code> method of the
+       <code>HotelBookingAction</code> bean is called with the <code>hot</code>
+       parameter that is specified in the query.  The parameter values are evaluated
+       at invocation time, not when the link is generated, so the <code>&lt;s:link&gt;</code>
+       tag adds a dataModelSelection parameter that indicates the value of the 
+       <code>hot</code> loop variable for the given row.</p>
+    <p>  The <code>selectHotel()</code> method merges the selected hotel into 
+       the current persistence context (in case the same
+       hotel has been accessed before in the same session),
+       and starts a Seam conversation. We will discuss Seam conversations
+       in the next step.
+    </p>
+    
+<code class="block">
+ at Stateful
+ at Name("hotelBooking")
+ at LoggedIn
+public class HotelBookingAction implements HotelBooking
+{
+
+   ... ...
+   
+   @Begin
+   public void selectHotel(Hotel selectedHotel)
+   {
+      hotel = em.merge(selectedHotel);
+   }
+}
+</code>
+
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,229 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">3</div>
+    <h2>What happens in the registration process?</h2>
+    <img src="img/header_line.gif" />
+    
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+    <p>
+       The register.xhtml JSF form captures the user input for new account
+       registration. It validates the user input, binds the data to a 
+       Seam data component, and invokes a Seam UI event handler method
+       when the form is submitted.
+    </p>
+    
+<code class="block">
+&lt;s:validateAll&gt;
+&lt;div class="entry"&gt;
+    &lt;div class="label"&gt;
+        &lt;h:outputLabel for="username">Username:&lt;/h:outputLabel&gt;
+    &lt;/div&gt;
+    &lt;div class="input"&gt;
+        &lt;h:inputText id="username" value="#{user.username}"/&gt;&lt;br/&gt;
+        &lt;span class="errors"&gt;&lt;h:message for="username" /&gt;&lt;/span&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
+&lt;div class="entry"&gt;
+    &lt;div class="label"&gt;
+        &lt;h:outputLabel for="name">Real Name:&lt;/h:outputLabel&gt;
+    &lt;/div&gt;
+    &lt;div class="input"&gt;
+        &lt;h:inputText id="name" value="#{user.name}" /&gt;&lt;br/&gt;
+        &lt;span class="errors">&lt;h:message for="name" /&gt;&lt;/span&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
+&lt;/s:validateAll&gt;
+
+... ...
+
+    &lt;div class="input"&gt;
+        &lt;h:commandButton value="Register" 
+                         action="#{register.register}" 
+                         class="button"/&gt;
+        &lt;h:commandButton value="Cancel" action="login" class="button"/&gt;
+    &lt;/div&gt;
+</code>
+
+   <p>
+      The form fields are bound to properties of a Seam component named
+      <code>user</code> via JSF EL value binding expressions such as
+      <code>#{user.username}</code>. The form submit button is bound
+      to the <code>register()</code> method of the Seam component named
+      <code>register</code> using the JSF method binding expression 
+      <code>#{register.register}</code>.
+   </p>
+
+   <p>
+       Notice that the input fields are enclosed by a <code>&lt;s:validateAll</code>
+       tag. This tag is part of Seam's extension to JSF. It tells the Seam
+       runtime to validate those input fields when the form is submitted.
+       The validation conditions are specified on the entity bean classes
+       those input fields map to (e.g., here the validation condition is
+       on the <code>User</code> class, see later).
+       This JSF form also includes <code>&lt;h:message&gt;</code> tags that
+       will display the results of any JSF validation failures.
+    </p>
+
+   <p>
+      The <code>User</code> class is an EJB 3.0 entity bean with a 
+      <code>@Name</code> annotation that binds the bean instance to a
+      context variable named <code>user</code>. In addition to the standard 
+      EJB 3.0 O/R mapping metadata, this bean features several Hibernate 
+      Validator annotations such as 
+      <code>@NotNull</code>, <code>@Length</code>. Due to the 
+      <code>&lt;s:validateAll</code> tag in the form, these constraints are 
+      automatically validated by Seam when the form is submitted. If the user 
+      enters invalid data in the JSF form, the form will be redisplayed with 
+      error messages.
+   </p>
+
+<code class="block">
+ at Entity
+ at Name("user")
+ at Scope(SESSION)
+public class User implements Serializable
+{
+   private String username;
+   private String password;
+   private String name;
+   
+   public User(String name, String password, String username)
+   {
+      this.name = name;
+      this.password = password;
+      this.username = username;
+   }
+   
+   public User() {}
+
+   @NotNull
+   @Length(max=100)
+   public String getName()
+   {
+      return name;
+   }
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   @NotNull
+   @Length(min=5, max=15)
+   public String getPassword()
+   {
+      return password;
+   }
+   public void setPassword(String password)
+   {
+      this.password = password;
+   }
+   
+   @Id
+   @Length(min=5, max=15)
+   public String getUsername()
+   {
+      return username;
+   }
+   public void setUsername(String username)
+   {
+      this.username = username;
+   }
+   
+}</code>
+
+    <p>
+       <code>RegisterAction</code> is an EJB 3.0 stateful session bean 
+       bound to the Seam context variable named <code>register</code>. 
+       The <code>register()</code> method is invoked  when the form is 
+       submitted.
+    </p>
+
+<code class="block">
+ at Stateful
+ at Scope(EVENT)
+ at Name("register")
+public class RegisterAction implements Register
+{
+
+   @In
+   private User user;
+   
+   @PersistenceContext
+   private EntityManager em;
+   
+   @In(create=true)
+   private transient FacesMessages facesMessages;
+   
+   private String verify;
+   
+   public String register()
+   {
+      if ( user.getPassword().equals(verify) )
+      {
+         List existing = em.createQuery("select username from User " + 
+                                        "where username=:username")
+            .setParameter("username", user.getUsername())
+            .getResultList();
+         if (existing.size()==0)
+         {
+            em.persist(user);
+            return "login";
+         }
+         else
+         {
+            facesMessages.add("username #{user.username} already exists");
+            return null;
+         }
+      }
+      else 
+      {
+         facesMessages.add("re-enter your password");
+         verify=null;
+         return null;
+      }
+   }
+
+   public String getVerify()
+   {
+      return verify;
+   }
+
+   public void setVerify(String verify)
+   {
+      this.verify = verify;
+   }
+   
+   @Destroy @Remove
+   public void destroy() {}
+}</code>
+
+    <p>
+       The <code>@In</code> annotations inject Seam components into the <code>RegisterAction</code>
+       bean. The <code>user</code> component is our entity bean, of course. The <code>facesMessages</code> 
+       component is a built-in Seam component that makes it very easy to display templated and localized
+       messages to the user, even when redirect after post is used.
+    </p>
+
+       <form>
+          <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+
+  </div>
+</div>
+
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,92 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>In-depth Explanation</title>
+	<link href="../css/trailblazer_main.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="main">
+  <div class="trail">
+    <div class="numbox">6</div>
+    <h2>The Workspace List</h2>
+    <img src="../img/header_line.gif" />
+    
+    <p>
+       <center>
+       <form>
+          <INPUT type="button" value="Close Window" onclick="window.close()">
+       </form>
+       </center>
+    </p>
+
+    <p>
+       The workspace list allows the user to switch between multiple
+       conversations from the same browser tab. There is no Java code
+       to write, just the following JSF code to include:
+    </p>
+
+<code class="block">
+&lt;h:dataTable value="#{conversationList}" var="entry"&gt;
+  &lt;h:column&gt;
+    &lt;h:commandLink action="#{entry.select}" value="#{entry.description}"/&gt;
+    &nbsp;
+    &lt;h:outputText value="[current]" rendered="#{entry.current}"/&gt;
+  &lt;/h:column&gt;
+  &lt;h:column&gt;
+    &lt;h:outputText value="#{entry.startDatetime}"&gt;
+      &lt;f:convertDateTime type="time" pattern="hh:mm"/&gt;
+    &lt;/h:outputText&gt;
+    -
+    &lt;h:outputText value="#{entry.lastDatetime}"&gt;
+      &lt;f:convertDateTime type="time" pattern="hh:mm"/&gt;
+    &lt;/h:outputText&gt;
+  &lt;/h:column&gt;
+&lt;/h:dataTable&gt;
+</code>
+
+    <p>
+       We do need to specify what text will be displayed by <code>#{entry.description}</code>. 
+       We do this by setting the <code>description</code> value for each page in <code>pages.xml</code>.
+    </p>
+
+<code class="block">
+&lt;pages&gt;
+   &lt;!-- ... --&gt;
+   &lt;page view-id="/hotel.xhtml" 
+         conversation-required="true" 
+	 login-required="true"&gt;
+          
+       &lt;description&gt;View hotel: #{hotel.name}&lt;/description&gt;
+       &lt;!-- ... --&gt;
+    &lt;/page&gt;
+
+    &lt;page view-id="/book.xhtml" 
+             conversation-required="true" 
+	     login-required="true"&gt;
+      
+        &lt;description&gt;Book hotel: #{hotel.name}&lt;/description&gt;
+        &lt;!-- ... --&gt;
+    &lt;/page&gt;
+&lt;pages&gt;
+</code>
+
+    <p>
+       Note that you don't need the <code>pages.xml</code> file if you don't want the
+       workspace list in your application.
+    </p>
+
+    <p>
+       <form>
+      <input type="button" value="Close Window" onclick="window.close()"/>
+       </form>
+    </p>
+
+  </div>
+</div>
+
+</body>
+</html>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml	2007-11-10 14:09:09 UTC (rev 147)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -1,12 +1,74 @@
-<ui:composition
-               xmlns:ui="http://java.sun.com/jsf/facelets"
-               xmlns:h="http://java.sun.com/jsf/html"
-               xmlns:f="http://java.sun.com/jsf/core"
-               xmlns:c="http://java.sun.com/jstl/core"
-               xmlns:s="http://jboss.com/products/seam/taglib">
-
-      <h:form id="form">
-        <s:button view="/about.xhtml">Test to about</s:button>
-      </h:form>
-
-</ui:composition>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://java.sun.com/jsf/html"
+	  xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:s="http://jboss.com/products/seam/taglib">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>JBoss Suites: Seam Framework</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body id="pgHome">
+<f:view>
+<div id="document">
+	<div id="header">
+		<div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
+	</div>
+	<div id="container">
+		<div id="sidebar">
+            <h:form id="login">
+			<fieldset>
+				<div>
+					<h:outputLabel for="username">Login Name</h:outputLabel>
+					<h:inputText id="username" value="#{identity.username}" style="width: 175px;"/>
+					<div class="errors"><h:message for="username"/></div>
+				</div>
+				<div>
+					<h:outputLabel for="password">Password</h:outputLabel>
+					<h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/>
+				</div>
+				<div class="errors"><h:messages globalOnly="true"/></div>
+				<div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Account Login"/></div>
+				<div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div>
+			</fieldset>
+            </h:form>
+		</div>
+		<div id="content">
+			<div class="section">
+				
+			    <h1>About this example application</h1>
+			    
+			    <p>
+			       This sample application demonstrates how easy it is to develop stateful web 
+			       applications using JBoss Seam. Just register, login, and book a room to see 
+			       Seam in action. Throughout the application you'll see popup links like 
+			       the ones at the bottom of this page. Click them to see how the application 
+			       works under the hood.
+                </p>
+			    
+			    <p>
+			       Note: Please do NOT enter personal information or your credit card number in 
+			       this sample application.
+			    </p>
+			    
+			    <p>
+			       <a href="#" onclick="window.open('exp/introExp.html','exp','width=752,height=500,scrollbars=yes');">
+			          What is JBoss Seam?
+			       </a>
+                </p>
+			    
+			    <p>
+			       <a href="#" onclick="window.open('exp/loginExp.html','exp','width=752,height=500,scrollbars=yes');">
+			          What happens when I login?
+			       </a>
+                </p>
+								
+			</div>
+		</div>
+	</div>
+	<div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
+</div>
+</f:view>
+</body>
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,56 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			xmlns:h="http://java.sun.com/jsf/html"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:s="http://jboss.com/products/seam/taglib"
+				template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+
+<div class="section">
+	<h1>View Hotel</h1>
+</div>
+
+<div class="section">
+	<ui:include src="hotelview.xhtml"/>
+
+	<div class="buttonBox">
+		<h:form id="hotel">
+			<h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
+			&#160;
+			<h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/>
+		</h:form>
+	</div>
+			
+
+</div>
+
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+
+<h1>Don't kill your database</h1>
+<p>
+    Keeping conversational state in memory in the middle tier is a great way to
+    improve your application's scalability. It saves hitting the database every
+    time we refresh a page, to re-read the data we were just looking at five 
+    seconds ago. By using Seam's conversation context, we get a natural cache 
+    of data associated with the what the user is currently doing. By nature, 
+    this cache has a more efficient eviction policy than the MRU-type algorithms 
+    used by a typical second-level data cache in an O/R mapping engine like
+    Hibernate (at least for some kinds of data). Of course, you should use 
+    a clever combination of second-level caching and conversational data
+    caching to achieve the best performance for your application.
+</p>
+<p>
+   <a href="#" onclick="window.open('exp/bookingExp.html','exp','width=752,height=500,scrollbars=yes');">
+      How does the hotel booking wizard work?
+   </a>
+</p>
+
+</ui:define>
+
+</ui:composition>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,45 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		 xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			 xmlns:h="http://java.sun.com/jsf/html"
+	  			 xmlns:f="http://java.sun.com/jsf/core"
+                 xmlns:s="http://jboss.com/products/seam/taglib">
+    
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">Name:</ui:define>
+		#{hotel.name}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">Address:</ui:define>
+		#{hotel.address}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">City:</ui:define>
+		#{hotel.city}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">State:</ui:define>
+		#{hotel.state}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">Zip:</ui:define>
+		#{hotel.zip}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">Country:</ui:define>
+		#{hotel.country}
+	</s:decorate>
+	
+    <s:decorate template="display.xhtml">             
+		<ui:define name="label">Nightly rate:</ui:define>
+		<h:outputText value="#{hotel.name}">
+			<f:convertNumber type="currency" currencySymbol="$"/>
+		</h:outputText>
+	</s:decorate>
+	  
+</ui:composition>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/btn.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/btn.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-next.png
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-next.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-prev.png
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cal-prev.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cnt.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/cnt.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/dtpick.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/dtpick.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.ad.jpg
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.ad.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bar.jpg
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bar.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.title.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/hdr.title.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/header_line.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/header_line.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/input.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/input.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/sdb.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/sdb.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/spinner.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/spinner.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/th.bg.gif
===================================================================
(Binary files differ)


Property changes on: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/img/th.bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,139 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			xmlns:h="http://java.sun.com/jsf/html"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:s="http://jboss.com/products/seam/taglib"
+                xmlns:a="http://richfaces.org/a4j"
+				template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+
+<div class="section">
+  
+    <span class="errors">
+       <h:messages globalOnly="true"/>
+    </span>
+    
+    <h1>Search Hotels</h1>
+
+	<h:form id="searchCriteria">
+	<fieldset> 
+	   <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;">
+         <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" />
+       </h:inputText>
+       &#160;
+	   <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/>
+       &#160;
+       <a:status>
+          <f:facet name="start">
+             <h:graphicImage value="/img/spinner.gif"/>
+          </f:facet>
+       </a:status>
+	   <br/>
+       <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>&#160;
+       <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize">
+          <f:selectItem itemLabel="5" itemValue="5"/>
+          <f:selectItem itemLabel="10" itemValue="10"/>
+          <f:selectItem itemLabel="20" itemValue="20"/>
+       </h:selectOneMenu>
+    </fieldset>
+    </h:form>
+    
+</div>
+
+<a:outputPanel id="searchResults">
+  <div class="section">
+	<h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
+	<h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
+		<h:column>
+			<f:facet name="header">Name</f:facet>
+			#{hot.name}
+		</h:column>
+		<h:column>
+			<f:facet name="header">Address</f:facet>
+			#{hot.address}
+		</h:column>
+		<h:column>
+			<f:facet name="header">City, State</f:facet>
+			#{hot.city}, #{hot.state}, #{hot.country}
+		</h:column> 
+		<h:column>
+			<f:facet name="header">Zip</f:facet>
+			#{hot.zip}
+		</h:column>
+		<h:column>
+			<f:facet name="header">Action</f:facet>
+			<s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
+		</h:column>
+	</h:dataTable>
+	<s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/>
+  </div>
+</a:outputPanel>
+
+<div class="section">
+	<h1>Current Hotel Bookings</h1>
+</div>
+<div class="section">
+  <h:form id="bookings">
+	<h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/>
+	<h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}">
+		<h:column>
+			<f:facet name="header">Name</f:facet>
+			#{book.hotel.name}
+		</h:column>
+		<h:column>
+			<f:facet name="header">Address</f:facet>
+			#{book.hotel.address}
+		</h:column>
+		<h:column>
+			<f:facet name="header">City, State</f:facet>
+			#{book.hotel.city}, #{book.hotel.state}
+		</h:column>
+        <h:column>
+            <f:facet name="header">Check in date</f:facet>
+            <h:outputText value="#{book.checkinDate}"/>
+        </h:column>
+        <h:column>
+            <f:facet name="header">Check out date</f:facet>
+            <h:outputText value="#{book.checkoutDate}"/>
+        </h:column>
+		<h:column>
+			<f:facet name="header">Confirmation number</f:facet>
+			#{book.id}
+		</h:column>
+		<h:column>
+			<f:facet name="header">Action</f:facet>
+			<h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/>
+		</h:column>
+	</h:dataTable>
+  </h:form>
+</div>
+
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+
+<h1>State management in Seam</h1>
+<p>
+   State in Seam is <em>contextual</em>. When you click "Find Hotels", the application
+   retrieves a list of hotels from the database and caches it in the session context. When you
+   navigate to one of the hotel records by clicking the "View Hotel" link, a <em>conversation</em> 
+   begins. The conversation is attached to a particular tab, in a particular browser window. You can
+   navigate to multiple hotels using "open in new tab" or "open in new window" in your web browser.
+   Each window will execute in the context of a different conversation. The application keeps state
+   associated with your hotel booking in the conversation context, which ensures that the concurrent
+   conversations do not interfere with each other.
+</p>
+
+<p>
+   <a href="#" onclick="window.open('exp/mainExp.html','exp','width=752,height=500,scrollbars=yes');">
+      How does the search page work?
+   </a>
+</p>
+
+</ui:define>
+
+</ui:composition>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,64 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+	    		xmlns:ui="http://java.sun.com/jsf/facelets"
+	  			xmlns:h="http://java.sun.com/jsf/html"
+	  			xmlns:f="http://java.sun.com/jsf/core"
+	  			xmlns:s="http://jboss.com/products/seam/taglib"
+				template="template.xhtml">
+
+<!-- content -->
+<ui:define name="content">
+
+<div class="section">
+	<h1>Change Your Password</h1>
+</div>
+
+<div class="section">
+
+	<div class="entry errors">
+		<h:messages globalOnly="true"/>
+	</div>
+			
+	<h:form id="setpassword">
+	
+		<fieldset>
+		
+			<s:decorate template="edit.xhtml">
+				<ui:define name="label">Password:</ui:define>
+				<h:inputSecret id="password" value="#{user.password}" required="true"/>
+			</s:decorate>
+			
+			<s:decorate template="edit.xhtml">
+				<ui:define name="label">Verify:</ui:define>
+				<h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/>
+			</s:decorate>
+			
+			<div class="buttonBox">
+				<h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>
+				&#160;
+				<s:button id="cancel" value="Cancel" view="/main.xhtml"/>
+			</div>
+			
+		</fieldset>
+		
+	</h:form>
+</div>
+
+</ui:define>
+
+<!-- sidebar -->
+<ui:define name="sidebar">
+<h1>Simple things should be easy</h1>
+<p>
+    (And so should some complex things.) You shouldn't have to write four different classes
+    just to change a password. Traditional J2EE architectures require that developers spend
+    more time writing code to make the frameworks happy, than they ever get to spend writing
+    code to make the user happy. Seam lets you reduce the size of your code dramatically.
+    And that reduces bugs. And it makes refactoring easier. And it makes delivering new 
+    functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you 
+    don't need to sacrifice the ability to handle complex problems just to achieve great
+    productivity.
+</p>
+</ui:define>
+
+</ui:composition>
\ No newline at end of file

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,102 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://java.sun.com/jsf/html"
+	  xmlns:f="http://java.sun.com/jsf/core"
+	  xmlns:s="http://jboss.com/products/seam/taglib"
+      xmlns:a="http://richfaces.org/a4j">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>JBoss Suites: Seam Framework</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="pgHome">
+
+<div id="document">
+
+	<div id="header">
+		<div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
+	</div>
+	
+	<div id="container">
+	
+		<div id="sidebar">		    
+			<h1>Integrated multi-layer validation</h1>
+			<p>
+			    Robust applications need data validation in several different places. Seam integrates Hibernate Validator,
+			    a set of annotations for expressing data model constraints in your domain model classes. Then, these 
+			    constraints are applied almost completely transparently at three levels of the application: by Seam when 
+			    the user first enters data, by EJB before persisting data to the database, and, if you use Hibernate to 
+			    generate your database schema, by the database constraints themselves. Multi-layer validation hardens
+			    your application and protects your data. Even better, it's self-documenting, and easy to change when
+			    your business rules change.
+			</p>
+			<p>
+			   <a href="#" onclick="window.open('exp/registerExp.html','exp','width=752,height=500,scrollbars=yes');">
+			      What happens when I register?
+			   </a>
+			</p>
+		</div>
+		
+		<div id="content">
+		
+			<div class="section">
+				<h1>Register</h1>
+			</div>
+			
+			<div class="section">
+                
+				<div class="entry errors">
+					<h:messages globalOnly="true"/>
+				</div>
+
+                <h:form id="registration">
+				<fieldset>
+				
+					<s:decorate id="usernameDecorate" template="edit.xhtml">
+						<ui:define name="label">Username:</ui:define>
+						<h:inputText id="username" value="#{user.username}" required="true">
+							<a:support event="onblur" reRender="usernameDecorate"/>
+						</h:inputText>
+					</s:decorate>
+					
+					<s:decorate id="nameDecorate" template="edit.xhtml">
+						<ui:define name="label">Real Name:</ui:define>
+						<h:inputText id="name" value="#{user.name}" required="true">
+							<a:support event="onblur" reRender="nameDecorate"/>
+						</h:inputText>
+					</s:decorate>
+					
+					<s:decorate id="passwordDecorate" template="edit.xhtml">
+						<ui:define name="label">Password:</ui:define>
+						<h:inputSecret id="password" value="#{user.password}" required="true"/>
+					</s:decorate>
+					
+					<s:decorate id="verifyDecorate" template="edit.xhtml">
+						<ui:define name="label">Verify Password:</ui:define>
+						<h:inputSecret id="verify" value="#{register.verify}" required="true"/>
+					</s:decorate>
+					
+					<div class="buttonBox">
+						<h:commandButton id="register" value="Register" action="#{register.register}"/>
+						&#160;
+						<s:button id="cancel" value="Cancel" view="/home.xhtml"/>
+					</div>
+									
+				</fieldset>
+                </h:form>
+                
+			</div>
+			
+		</div>
+		
+	</div>
+	
+	<div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
+	
+</div>
+
+</body>
+
+</html>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml	2007-11-12 20:01:02 UTC (rev 148)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:s="http://jboss.com/products/seam/taglib">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>JBoss Suites: Seam Framework</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div id="document">
+	<div id="header">
+		<div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
+		<div id="status">
+            Welcome #{user.name}
+            | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/>
+            | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/>
+            | <s:link id="logout" action="#{identity.logout}" value="Logout"/>
+		</div>
+	</div>
+	<div id="container">
+		<div id="sidebar">
+			<ui:insert name="sidebar"/>
+		</div>
+		<div id="content">
+			<ui:insert name="content"/>
+		    <ui:include src="conversations.xhtml" />
+		</div>
+	</div>
+	<div id="footer">Created with JBoss Seam 2.0, JBoss EJB 3.0, JSF 1.2, Hibernate 3 and Facelets</div>
+</div>
+</body>
+</html>




More information about the jboss-svn-commits mailing list