[jboss-cvs] jboss-seam/examples/dvdstore/web ...
Norman Richards
norman.richards at jboss.com
Thu Mar 22 17:50:00 EDT 2007
User: nrichards
Date: 07/03/22 17:50:00
Modified: examples/dvdstore/web browse.xhtml checkout.xhtml
confirm.xhtml dvd.xhtml showorders.xhtml
Log:
remove last of JSTL
Revision Changes Path
1.25 +93 -104 jboss-seam/examples/dvdstore/web/browse.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: browse.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/browse.xhtml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- browse.xhtml 2 Nov 2006 18:26:04 -0000 1.24
+++ browse.xhtml 22 Mar 2007 21:50:00 -0000 1.25
@@ -5,7 +5,6 @@
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<body>
@@ -23,18 +22,14 @@
</ui:define>
<ui:define name="body">
- <c:choose>
- <c:when test="#{searchResults==null}">
- <p>
- This is the DVD search screen. Use the search
- box to the right to search for DVDs. The
- search component is a conversational Seam
- component. You can perform multiple searches
- in multiple windows, and Seam will keep them
- all separate. The shopping cart, of course,
- is shared, allowing the customer to place
- items in the cart from any of the search screens.
- </p>
+ <f:subview rendered="#{searchResults==null}">
+ <p> This is the DVD search screen. Use the search box
+ to the right to search for DVDs. The search component
+ is a conversational Seam component. You can perform
+ multiple searches in multiple windows, and Seam will
+ keep them all separate. The shopping cart, of course,
+ is shared, allowing the customer to place items in the
+ car from any of the search screens.</p>
<div class="bestouter">
<ui:repeat value="#{topProducts}" var="item">
@@ -54,16 +49,15 @@
</div>
</ui:repeat>
</div>
- </c:when>
+ </f:subview>
- <c:when test="#{empty searchResults}">
+ <f:subview rendered="#{searchResults.rowCount == 0}">
<h2>
<h:outputText value="#{messages.noSearchResultsHeader}" />
</h2>
- </c:when>
+ </f:subview>
- <c:otherwise>
- <h:form>
+ <h:form rendered="#{searchResults.rowCount > 0}">
<div class="controlBar">
<div class="buttonbox">
<div class="button">
@@ -80,9 +74,7 @@
</div>
</div>
- <div class="message">
- #{messages.searchResultsHeader}
- </div>
+ <div class="message">#{messages.searchResultsHeader}</div>
</div>
<h:dataTable value="#{searchResults}"
@@ -128,9 +120,6 @@
value="#{messages.searchUpdateButton}"/>
</h:form>
- </c:otherwise>
-
- </c:choose>
</ui:define>
</ui:composition>
</body>
1.19 +1 -2 jboss-seam/examples/dvdstore/web/checkout.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: checkout.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/checkout.xhtml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- checkout.xhtml 15 Feb 2007 03:11:30 -0000 1.18
+++ checkout.xhtml 22 Mar 2007 21:50:00 -0000 1.19
@@ -3,8 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:h="http://java.sun.com/jsf/html">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
1.12 +4 -5 jboss-seam/examples/dvdstore/web/confirm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: confirm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/confirm.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- confirm.xhtml 17 Dec 2006 15:31:49 -0000 1.11
+++ confirm.xhtml 22 Mar 2007 21:50:00 -0000 1.12
@@ -3,8 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:h="http://java.sun.com/jsf/html">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
1.9 +5 -6 jboss-seam/examples/dvdstore/web/dvd.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dvd.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/dvd.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- dvd.xhtml 14 Nov 2006 05:03:01 -0000 1.8
+++ dvd.xhtml 22 Mar 2007 21:50:00 -0000 1.9
@@ -4,8 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:h="http://java.sun.com/jsf/html">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
@@ -35,9 +34,9 @@
<h:outputText value="Starring:" />
<h:panelGroup>
- <c:forEach items="#{dvd.actors}" var="starring">
+ <ui:repeat value="#{dvd.actors}" var="starring">
[#{starring.name}]
- </c:forEach>
+ </ui:repeat>
</h:panelGroup>
<h:outputText value="Price:" />
1.20 +1 -2 jboss-seam/examples/dvdstore/web/showorders.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: showorders.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/showorders.xhtml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- showorders.xhtml 20 Nov 2006 19:45:27 -0000 1.19
+++ showorders.xhtml 22 Mar 2007 21:50:00 -0000 1.20
@@ -4,8 +4,7 @@
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:h="http://java.sun.com/jsf/html">
<body>
<ui:composition template="/WEB-INF/template.xhtml">
<ui:define name="topnav">
More information about the jboss-cvs-commits
mailing list