[jboss-svn-commits] JBoss PortletSwap SVN: r149 - in portlets/src/framework/SeamBookingPortlet: web/src/main/resources/portal and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 12 16:07:59 EST 2007


Author: wesleyhales
Date: 2007-11-12 16:07:59 -0500 (Mon, 12 Nov 2007)
New Revision: 149

Modified:
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/ObserveInitialization.java
   portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/SecurityHelper.java
   portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/jboss-portlet.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml
   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/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/home.xhtml
   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/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
Log:
update to demo & fixes

Modified: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/ObserveInitialization.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/ObserveInitialization.java	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/ObserveInitialization.java	2007-11-12 21:07:59 UTC (rev 149)
@@ -40,7 +40,7 @@
 
    @Observer("org.jboss.seam.postInitialize")
    public void observe() {
-      System.out.println("-------------------------------------observer");
-      Identity.setSecurityEnabled(false);
+      //System.out.println("-------------------------------------observer");
+      //Identity.setSecurityEnabled(false);
    }
 }

Modified: portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/SecurityHelper.java
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/SecurityHelper.java	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/ejb/src/main/java/com/testapp/SecurityHelper.java	2007-11-12 21:07:59 UTC (rev 149)
@@ -40,7 +40,7 @@
 
    @Observer("org.jboss.seam.postInitialize")
    public void observe() {
-      System.out.println("-------------------------------------observer");
-      Identity.setSecurityEnabled(false);
+      //System.out.println("-------------------------------------observer");
+      //Identity.setSecurityEnabled(false);
    }
 }

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/jboss-portlet.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/jboss-portlet.xml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/jboss-portlet.xml	2007-11-12 21:07:59 UTC (rev 149)
@@ -5,5 +5,8 @@
    "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"><portlet-app>
     <portlet>
          <portlet-name>seamPortlet</portlet-name>
+          <header-content>
+            <link rel="stylesheet" type="text/css" href="/css/screen.css" media="screen"/>
+         </header-content>
     </portlet>
 </portlet-app> 
\ No newline at end of file

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-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml	2007-11-12 21:07:59 UTC (rev 149)
@@ -53,9 +53,9 @@
 
     </page>
 
-	<page view-id="/hotel.xhtml"
-	      conversation-required="true"
-	      login-required="true">
+   <page view-id="/hotel.xhtml"
+         conversation-required="true"
+         login-required="true">
 
         <description>View hotel: #{hotel.name}</description>
 
@@ -65,9 +65,9 @@
 
     </page>
 
-	<page view-id="/book.xhtml"
-	      conversation-required="true"
-	      login-required="true">
+   <page view-id="/book.xhtml"
+         conversation-required="true"
+         login-required="true">
 
         <description>Book hotel: #{hotel.name}</description>
 
@@ -79,9 +79,9 @@
 
     </page>
 
-	<page view-id="/confirm.xhtml"
-	      conversation-required="true"
-	      login-required="true">
+   <page view-id="/confirm.xhtml"
+         conversation-required="true"
+         login-required="true">
 
         <description>Confirm booking: #{booking.description}</description>
 

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,104 +1,104 @@
 <!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: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">
+            template="template.xhtml">
 
 <!-- content -->
 <ui:define name="content">
 <div class="section">
-	<h1>Book Hotel</h1>
+   <h1>Book Hotel</h1>
 </div>
 <div class="section">
-	<div class="entry errors">
-		<h:messages globalOnly="true"/>
-	</div>
+   <div class="entry errors">
+      <h:messages globalOnly="true"/>
+   </div>
 
-	<ui:include src="hotelview.xhtml"/>
-	
-	<div style="clear:both"/>
+   <ui:include src="hotelview.xhtml"/>
 
-	<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>
+   <div style="clear:both"/>
 
-		<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>
+   <h:form id="booking">
+   <fieldset>
 
-		<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="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="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>
+      <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>
 
@@ -113,7 +113,7 @@
 </p>
 <p>
    <a href="#" onclick="window.open('exp/workspaceExp.html','exp','width=752,height=500,scrollbars=yes');">
-	  How does the workspace list work?
+     How does the workspace list work?
    </a>
 </p>
 

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/confirm.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,54 +1,54 @@
 <!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: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">
+            template="template.xhtml">
 
 <!-- content -->
 <ui:define name="content">
 
 <div class="section">
-	<h1>Confirm Hotel Booking</h1>
+   <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>
+   <ui:include src="hotelview.xhtml"/>
 
-	<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">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 Out Date:</ui:define>
-		<h:outputText value="#{booking.checkoutDate}"/>
-	</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">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>
+   <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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/conversations.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -5,32 +5,32 @@
      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>
+   <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

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/css/screen.css	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,274 +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;
+#document body, #document div, #document span, #document dd, #document dt, #document dl, #document img, #document ul, #document ol, #document li, #document p, #document h1, #document h2, #document h3, #document h4, #document h5, #document form, #document hr, #document fieldset {
+   margin: 0;
+   padding: 0;
 }
 /* Element Defaults
 ----------------------------------------------- */
-html {
-	height: 100%;
-	background-color: #DBD4C6;
+div#content-container html {
+   height: 100%;
+   background-color: #DBD4C6;
 }
-img {
-	border: 0;
+#document 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;
+#pgHome {
+   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;
+#document .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;
+#document 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;
+#document 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;
+#document ol, #document ul {
+   margin: 10px 0px 10px 6px;
 }
-li {
-	margin: 10px 12px;
+#document li {
+   margin: 10px 12px;
 }
-fieldset {
-	border: 0;
+#document 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;
+   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;
+#document #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;
+#document #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;
+#document #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;
+#document #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;
+#document #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;
+#document input[type="submit"], #document 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;
+#document .center {
+   text-align: center;
 }
-.entry {
-	clear: both;
-	padding-top: 10px;
+#document .entry {
+   clear: both;
+   padding-top: 10px;
 }
-.entry .label {
-	float: left;
-	padding-right: 5px;
-	font-weight: bold;
-	width: 150px;
-	text-align: right;
+#document .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;
+#document .entry .output {
+   float: right;
+   width: 360px;
+   padding-top: 10px;
+   text-align: left;
 }
-.entry .input {
-	float: right;
-	width: 360px;
-	text-align: left;
+#document .entry .input {
+   float: right;
+   width: 360px;
+   text-align: left;
 }
-.entry .error {
-	float: right;
-	width: 360px;
-	text-align: left;
+#document .entry .error {
+   float: right;
+   width: 360px;
+   text-align: left;
 }
 /* Sidebar
 ----------------------------------------------- */
-.notes {
-	text-align: center;
-	font-size: small;
+#document .notes {
+   text-align: center;
+   font-size: small;
 }
-.errors {
-	font-size: small;
-	font-weight: bold;
-	text-align: center;
-	color: #600;
+#document .errors {
+   font-size: small;
+   font-weight: bold;
+   text-align: center;
+   color: #600;
 }
-.errors div {
-	text-align: left;
+#document .errors div {
+   text-align: left;
 }
-.errors span {
-	text-align: left;
+#document .errors span {
+   text-align: left;
 }
-.errors input {
-	border: 1px solid #600;
+#document .errors input {
+   border: 1px solid #600;
 }
-.errors ul {
-	list-style: none;
+#document .errors ul {
+   list-style: none;
 }
-.buttonBox {
-	text-align: center;
-	padding: 5px 0;
-	clear: both;
+#document .buttonBox {
+   text-align: center;
+   padding: 5px 0;
+   clear: both;
 }
-#sidebar p {
-	font-size: small;
-	color: #8B7869;
-	line-height: 150%;
-	padding-bottom: 10px;
+#document #sidebar p {
+   font-size: small;
+   color: #8B7869;
+   line-height: 150%;
+   padding-bottom: 10px;
 }
-#sidebar li {
-	font-size: small;
-	color: #8B7869;
+#document #sidebar li {
+   font-size: small;
+   color: #8B7869;
 }
-#sidebar h1 {
-	line-height: normal;
-	font-weight: bold;
-	font-size: small;
+#document #sidebar h1 {
+   line-height: normal;
+   font-weight: bold;
+   font-size: small;
 }
 /*
 #sidebar p:hover {
-	color: #362F2D;
+   color: #362F2D;
 }
 */
 /* Content
 ----------------------------------------------- */
-#content .section {
-	float: left;
-	width: 518px;
-	padding: 15px 15px 0 15px;
+#document #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;
+#document #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;
+#document #content .section p {
+   line-height: 150%;
+   padding: 10px 0;
+   font-size: small;
 }
-#content table {
-	width: 100%;
-	border: 1px solid #D2C9C4;
-	border-collapse: collapse;
+#document #content table {
+   width: 100%;
+   border: 1px solid #D2C9C4;
+   border-collapse: collapse;
 }
-#content table caption {
-	padding-bottom: 6px;
-	text-align: left;
-	font-weight: bold;
+#document #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;
+#document #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;
+#document #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%;
+#document #content dt {
+   font-weight: bold;
+   float: left;
+   width: 33%;
 }
-#content dd {
-	padding-left: 10px;
-	float: left;
-	width: 66%;
+#document #content dd {
+   padding-left: 10px;
+   float: left;
+   width: 66%;
 }
-#content table.radio {
-	border: 0px;
+#document #content table.radio {
+   border: 0px;
 }
-#content table.radio tbody tr td {
-	border: 0px;
-	border-left: 0px;
-	border-bottom: 0px;
+#document #content table.radio tbody tr td {
+   border: 0px;
+   border-left: 0px;
+   border-bottom: 0px;
 }
 /* Header
 ----------------------------------------------- */
-#title {
-	float: left;
-	padding: 1px 0 6px 15px;
+#document #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;
+#document #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;
+#document #status a {
+   color: #C7B299;
+   text-decoration: none;
 }
 /* Homepage Modifications
 ----------------------------------------------- */
 #pgHome #container {
-	background: url(../img/hdr.ad.jpg) 0 0 repeat-x;
+   background: url(../img/hdr.ad.jpg) 0 0 repeat-x;
 }
 #pgHome #sidebar {
-	margin-top: 207px;
+   margin-top: 207px;
 }
 #pgHome #content {
-	margin-top: 183px;
+   margin-top: 183px;
 }

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/bookingExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/confirmExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/introExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>
@@ -44,7 +44,7 @@
        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 

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/loginExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/mainExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>
@@ -138,27 +138,27 @@
 &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" 
+   &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:column&gt;
 &lt;/h:dataTable&gt;
 </code>
 

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/registerExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/exp/workspaceExp.html	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,9 +2,9 @@
           "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" />
+   <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>
@@ -58,7 +58,7 @@
    &lt;!-- ... --&gt;
    &lt;page view-id="/hotel.xhtml" 
          conversation-required="true" 
-	 login-required="true"&gt;
+    login-required="true"&gt;
           
        &lt;description&gt;View hotel: #{hotel.name}&lt;/description&gt;
        &lt;!-- ... --&gt;
@@ -66,7 +66,7 @@
 
     &lt;page view-id="/book.xhtml" 
              conversation-required="true" 
-	     login-required="true"&gt;
+        login-required="true"&gt;
       
         &lt;description&gt;Book hotel: #{hotel.name}&lt;/description&gt;
         &lt;!-- ... --&gt;

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/home.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,73 +1,75 @@
 <!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: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:c="http://java.sun.com/jstl/core">
 <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" />
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+   <title>JBoss Suites: Seam Framework</title>
+   <!--<c:set var="context" value="${facesContext.externalContext.requestContextPath}" />
+   <link href="#{context}/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">
+   <div id="header">
+      <div id="title"><h:graphicImage url="/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>
+         <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.
+      </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>
+                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>
+                <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>
+      </div>
+   </div>
+   <div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
 </div>
 </f:view>
 </body>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotel.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,30 +1,30 @@
 <!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: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">
+            template="template.xhtml">
 
 <!-- content -->
 <ui:define name="content">
 
 <div class="section">
-	<h1>View Hotel</h1>
+   <h1>View Hotel</h1>
 </div>
 
 <div class="section">
-	<ui:include src="hotelview.xhtml"/>
+   <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 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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/hotelview.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,45 +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: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>
-	
+      <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>
-	
+      <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>
-	
+      <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>
-	
+      <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>
-	
+      <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>
-	
+      <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:define name="label">Nightly rate:</ui:define>
+      <h:outputText value="#{hotel.name}">
+         <f:convertNumber type="currency" currencySymbol="$"/>
+      </h:outputText>
+   </s:decorate>
+
 </ui:composition>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,11 +1,11 @@
 <!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: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">
+            template="template.xhtml">
 
 <!-- content -->
 <ui:define name="content">
@@ -18,20 +18,20 @@
     
     <h1>Search Hotels</h1>
 
-	<h:form id="searchCriteria">
-	<fieldset> 
-	   <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;">
+   <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"/>
+      <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/>
+      <br/>
        <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>&#160;
        <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize">
           <f:selectItem itemLabel="5" itemValue="5"/>
@@ -45,52 +45,52 @@
 
 <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}"/>
+   <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>
+   <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: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}"/>
@@ -99,15 +99,15 @@
             <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: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>
 

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/password.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,47 +1,47 @@
 <!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">
+             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>
+   <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 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>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -1,100 +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">
+     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:c="http://java.sun.com/jstl/core">
 <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" />
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+   <title>JBoss Suites: Seam Framework</title>
+   <!--<c:set var="context" value="${facesContext.externalContext.requestContextPath}" />
+   <link href="#{context}/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 id="header">
+      <div id="title"><h:graphicImage url="/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>
+            <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>
+            <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>
+
+      </div>
+
+   </div>
+
+   <div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
+
 </div>
 
 </body>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml	2007-11-12 20:01:02 UTC (rev 148)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/template.xhtml	2007-11-12 21:07:59 UTC (rev 149)
@@ -2,34 +2,36 @@
 <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">
+      xmlns:s="http://jboss.com/products/seam/taglib"
+      xmlns:c="http://java.sun.com/jstl/core">
 <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" />
+   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+   <title>JBoss Suites: Seam Framework</title>
+   <!--<c:set var="context" value="${facesContext.externalContext.requestContextPath}" />
+   <link href="#{context}/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">
+   <div id="header">
+      <div id="title"><h:graphicImage url="/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>
+   </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