[seam-commits] Seam SVN: r9182 - in branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces: resources/WEB-INF/lib and 1 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Oct 3 09:13:40 EDT 2008


Author: manaRH
Date: 2008-10-03 09:13:40 -0400 (Fri, 03 Oct 2008)
New Revision: 9182

Added:
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml
Removed:
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml
Modified:
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/components.xml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/faces-config.xml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/commons-fileupload.jar
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/icefaces-comps.jar
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/icefaces.jar
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/web.xml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/book.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/confirm.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/home.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/hotel.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/main.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/password.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/register.xhtml
   branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/template.xhtml
Log:
JBPAPP-1129

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/components.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/components.xml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/components.xml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -1,28 +1,26 @@
-<!DOCTYPE components PUBLIC
-  "-//JBoss/Seam Component Configuration DTD 1.2//EN"
-  "http://jboss.com/products/seam/components-1.2.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 
-<components>
+<components xmlns="http://jboss.com/products/seam/components"
+            xmlns:core="http://jboss.com/products/seam/core"
+            xmlns:security="http://jboss.com/products/seam/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation=
+                "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd
+                 http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd
+                 http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd">
 
-    <component name="org.jboss.seam.core.init">
-        <property name="debug">true</property>
-        <property name="jndiPattern">@jndiPattern@</property>
-    </component>
-    
-    <component name="org.jboss.seam.core.manager">
-        <!-- half second wait for conversation lock on concurrent requests -->
-        <property name="concurrentRequestTimeout">500</property>
-        <!-- 120 second conversation timeout -->
-        <property name="conversationTimeout">120000</property>
-        <property name="conversationIdParameter">cid</property>
-        <property name="conversationIsLongRunningParameter">clr</property>
-    </component>
-    
-    <component name="org.jboss.seam.core.pages">
-        <property name="noConversationViewId">/main.xhtml</property>
-    </component>
 
-    <component class="org.jboss.seam.core.Ejb" 
-           installed="@embeddedEjb@"/>
+    <core:init jndi-pattern="@jndiPattern@" debug="true"/>
 
+    <core:manager conversation-timeout="120000"
+                  concurrent-request-timeout="500"
+                  conversation-id-parameter="cid"
+                  conversation-is-long-running-parameter="clr"/>    
+
+    <core:transactionListener/>
+
+    <core:ejb installed="@embeddedEjb@"/>
+
+    <security:identity authenticate-method="#{authenticator.authenticate}"/>
+
 </components>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/faces-config.xml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/faces-config.xml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+
 <!DOCTYPE faces-config 
     PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
     "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
     
 <faces-config>
--->
-<faces-config version="1.2"
+
+<!--<faces-config version="1.2"
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
+-->
     <managed-bean>
         <managed-bean-name>highlight</managed-bean-name>
         <managed-bean-class>com.icesoft.faces.context.effects.Highlight</managed-bean-class>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/commons-fileupload.jar
===================================================================
(Binary files differ)

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/icefaces-comps.jar
===================================================================
(Binary files differ)

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/lib/icefaces.jar
===================================================================
(Binary files differ)

Deleted: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -1,9 +0,0 @@
-<!DOCTYPE pages PUBLIC
-  "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
-  "http://jboss.com/products/seam/pages-1.2.dtd">
-
-<pages>
-	<page view-id="/hotel.xhtml">View hotel: #{hotel.name}</page>
-	<page view-id="/book.xhtml">Book hotel: #{hotel.name}</page>
-	<page view-id="/confirm.xhtml">Confirm: #{booking.description}</page>
-</pages>

Added: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml	                        (rev 0)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -0,0 +1,111 @@
+<!DOCTYPE pages PUBLIC
+          "-//JBoss/Seam Pages Configuration DTD 1.2//EN"
+          "http://jboss.com/products/seam/pages-1.2.dtd">
+
+<pages no-conversation-view-id="/main.xhtml"
+                 login-view-id="/home.xhtml">
+
+    <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">
+    
+        <navigation>
+            <rule if="#{identity.loggedIn}">
+                <redirect view-id="/main.xhtml"/>
+            </rule>
+        </navigation>
+        
+    </page>
+    
+    <page view-id="/password.xhtml"
+          login-required="true">
+    
+        <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">
+          
+        <description>View hotel: #{hotel.name}</description>
+        
+        <navigation from-action="#{hotelBooking.bookHotel}">
+            <redirect view-id="/book.xhtml"/>
+        </navigation>
+        
+    </page>
+
+	<page view-id="/book.xhtml">
+          
+        <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">
+          
+        <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="/home.xhtml">
+            <message severity="warn">You must be logged in to use this feature</message>
+        </redirect>
+    </exception>
+    
+    <exception class="javax.faces.application.ViewExpiredException">
+        <redirect view-id="/home.xhtml">
+            <message severity="warn">Session expired, please log in again</message>
+        </redirect>
+    </exception>
+
+</pages>


Property changes on: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/pages.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/web.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/web.xml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/resources/WEB-INF/web.xml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -42,7 +42,7 @@
     
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
+        <param-value>server</param-value>
     </context-param>
 
     <context-param>
@@ -64,7 +64,23 @@
         <param-name>com.icesoft.faces.synchronousUpdate</param-name>
         <param-value>true</param-value>
     </context-param>
+    
+    <context-param> 
+        <param-name>com.icesoft.faces.doJSFStateManagement</param-name>
+	    <param-value>true</param-value>
+    </context-param> 
 
+    <context-param>
+        <param-name>com.icesoft.faces.standardRequestScope</param-name>
+        <param-value>true</param-value>
+    </context-param>
+  	
+  	<context-param>
+        <param-name>com.icesoft.faces.concurrentDOMViews</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    
+
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/book.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/book.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/book.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -28,16 +28,20 @@
 			
 		<s:decorate id="checkinDateDecorate" template="edit.xhtml">
 			<ui:define name="label">Check In Date:</ui:define>
-			<ice:selectInputDate id="checkinDate" value="#{booking.checkinDate}" renderAsPopup="true" partialSubmit="true">
-				<f:convertDateTime type="date" dateStyle="medium" />
-			</ice:selectInputDate> 
+			<span class="calendar">			
+				<ice:selectInputDate id="checkinDate" value="#{booking.checkinDate}" renderAsPopup="true" partialSubmit="true">
+					<f:convertDateTime type="date" dateStyle="medium" />
+				</ice:selectInputDate>
+			</span> 
 		</s:decorate>
 		
 		<s:decorate id="checkoutDateDecorate" template="edit.xhtml">
 			<ui:define name="label">Check Out Date:</ui:define>
-			<ice:selectInputDate id="checkoutDate" value="#{booking.checkoutDate}" renderAsPopup="true" partialSubmit="true">
-				<f:convertDateTime type="date" dateStyle="medium" />
-			</ice:selectInputDate> 
+			<span class="calendar">
+				<ice:selectInputDate id="checkoutDate" value="#{booking.checkoutDate}" renderAsPopup="true" partialSubmit="true">
+					<f:convertDateTime type="date" dateStyle="medium" />
+				</ice:selectInputDate>
+			</span> 
 		</s:decorate>
 		
 		<s:decorate id="bedsDecorate" template="edit.xhtml">
@@ -96,7 +100,7 @@
 		</s:decorate>
 		
 		<div class="buttonBox">
-			<h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
+			<ice:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
 			&#160;
 			<s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
 		</div>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/confirm.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/confirm.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/confirm.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -4,6 +4,7 @@
 	  			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:ice="http://www.icesoft.com/icefaces/component"
 				template="template.xhtml">
 
 <!-- content -->
@@ -41,11 +42,11 @@
 	
 	<div class="buttonBox">
 		<h:form id="confirm">
-			<h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>
+			<ice: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}"/>
+    		<s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
 		</h:form>
 	</div>
 

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/home.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/home.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/home.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -3,6 +3,7 @@
 	  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:ice="http://www.icesoft.com/icefaces/component"
       xmlns:s="http://jboss.com/products/seam/taglib">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -29,7 +30,7 @@
 					<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="buttonBox"><ice:commandButton id="login" action="#{identity.login}" value="Account Login" styleClass="button"/></div>
 				<div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div>
 			</fieldset>
             </h:form>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/hotel.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/hotel.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/hotel.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -4,6 +4,7 @@
 	  			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:ice="http://www.icesoft.com/icefaces/component"
 				template="template.xhtml">
 
 <!-- content -->
@@ -18,9 +19,9 @@
 
 	<div class="buttonBox">
 		<h:form id="hotel">
-			<h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
+			<ice:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
 			&#160;
-			<h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/>
+			<s:button id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/>
 		</h:form>
 	</div>
 			

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/main.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/main.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/main.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -42,38 +42,42 @@
     
 </div>
 
-  <div class="section">
-	<h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
-	<ice:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
-		<h:column>
-			<f:facet name="header">Name</f:facet>
-			<ice:outputText value="#{hot.name}" onmouseovereffect="#{highlight}"/>
-		</h:column>
-		<h:column>
-			<f:facet name="header">Address</f:facet>
-			<ice:outputText value="#{hot.address}" onmouseovereffect="#{highlight}"/>
-		</h:column>
-		<h:column>
-			<f:facet name="header">City, State</f:facet>
-			<ice:outputText value="#{hot.city}, #{hot.state}, #{hot.country}" onmouseovereffect="#{highlight}"/>
-		</h:column> 
-		<h:column>
-			<f:facet name="header">Zip</f:facet>
-			<ice:outputText value="#{hot.zip}" onmouseovereffect="#{highlight}"/>
-		</h:column>
-		<h:column>
-			<f:facet name="header">Action</f:facet>
-			<s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
-		</h:column>
-	</ice:dataTable>
-	<s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/>
-  </div>
+<ice:form>
+    <ice:panelGroup id="searchResults">
+	  <div class="section">
+		<h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
+		<ice:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
+			<h:column>
+				<f:facet name="header">Name</f:facet>
+				<ice:outputText value="#{hot.name}" onmouseovereffect="#{highlight}"/>
+			</h:column>
+			<h:column>
+				<f:facet name="header">Address</f:facet>
+				<ice:outputText value="#{hot.address}" onmouseovereffect="#{highlight}"/>
+			</h:column>
+			<h:column>
+				<f:facet name="header">City, State</f:facet>
+				<ice:outputText value="#{hot.city}, #{hot.state}, #{hot.country}" onmouseovereffect="#{highlight}"/>
+			</h:column> 
+			<h:column>
+				<f:facet name="header">Zip</f:facet>
+				<ice:outputText value="#{hot.zip}" onmouseovereffect="#{highlight}"/>
+			</h:column>
+			<h:column>
+				<f:facet name="header">Action</f:facet>
+				<ice:commandLink id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
+			</h:column>
+		</ice:dataTable>
+		<s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/>
+	  </div>
+    </ice:panelGroup>
+</ice:form>
 
 <div class="section">
 	<h1>Current Hotel Bookings</h1>
 </div>
 <div class="section">
-  <h:form id="bookings">
+  <ice:form id="bookings">
 	<h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/>
 	<ice:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}">
 		<h:column>
@@ -105,7 +109,7 @@
 			<ice:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/>
 		</h:column>
 	</ice:dataTable>
-  </h:form>
+  </ice:form>
 </div>
 
 </ui:define>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/password.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/password.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/password.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -4,6 +4,7 @@
 	  			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:ice="http://www.icesoft.com/icefaces/component" 
 				template="template.xhtml">
 
 <!-- content -->
@@ -25,16 +26,16 @@
 		
 			<s:decorate template="edit.xhtml">
 				<ui:define name="label">Password:</ui:define>
-				<h:inputSecret id="password" value="#{user.password}" required="true"/>
+                <ice: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"/>
+				<ice:inputSecret id="verify" value="#{changePassword.verify}" required="true"/>
 			</s:decorate>
 			
 			<div class="buttonBox">
-				<h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>
+				<ice:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>
 				&#160;
 				<s:button id="cancel" value="Cancel" view="/main.xhtml"/>
 			</div>

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/register.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/register.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/register.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -75,7 +75,7 @@
 					</s:decorate>
 					
 					<div class="buttonBox">
-						<h:commandButton id="register" value="Register" action="#{register.register}"/>&#160;
+						<ice:commandButton id="register" value="Register" action="#{register.register}"/>&#160;
 						<s:button id="cancel" value="Cancel" view="/home.xhtml"/>
 					</div>
 				</s:validateAll>					

Modified: branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/template.xhtml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/template.xhtml	2008-10-03 03:37:45 UTC (rev 9181)
+++ branches/enterprise/JBPAPP_4_2_CP01/examples/icefaces/view/template.xhtml	2008-10-03 13:13:40 UTC (rev 9182)
@@ -2,13 +2,17 @@
 <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:ice="http://www.icesoft.com/icefaces/component">
+      
 <head>
+     <ice:outputDeclaration doctypeRoot="HTML"
+        doctypePublic="-//W3C//DTD XHTML 1.0 Transitional//EN"
+        doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>  
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>JBoss Suites: Seam Framework</title>
+    <link rel='stylesheet' type='text/css' href='./xmlhttp/css/xp/xp.css'/>
 	<link href="css/screen.css" rel="stylesheet" type="text/css" />
-	<link href="css/date.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" type="text/css" href="./xmlhttp/css/xp/xp.css" />
 </head>
 <body>
 




More information about the seam-commits mailing list