Author: manaRH
Date: 2012-05-21 07:04:51 -0400 (Mon, 21 May 2012)
New Revision: 14711
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
Log:
JBSEAM-4852 - fixed some remaining migrations to JSF2
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/incl/searchbox.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -12,7 +12,8 @@
<dt><h:outputText value="#{messages.searchCategory}"/></dt>
<dd>
<h:selectOneMenu value="#{search.category}">
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
<s:selectItems value="#{allCategories.resultList}"
var="category"
label="#{category.name}"/>
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/buy.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -34,7 +34,8 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}"
styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat"
value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat"
label="#{cat.name}" noSelectionLabel="All Categories"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</h:selectOneMenu>
<br/>
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/seambay/seambay-web/src/main/webapp/search.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -25,7 +25,8 @@
<h:inputText id="searchTerm" value="#{auctionSearch.searchTerm}"
styleClass="searchTerm"/>
<h:selectOneMenu id="selectedCat"
value="#{auctionSearch.searchCategory}">
<s:selectItems value="#{categories}" var="cat" label="#{cat.name}"
noSelectionLabel="All Categories"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter" />
</h:selectOneMenu>
<h:commandButton action="#{auctionSearch.queryAuctions}"
value="Search"/>
Modified:
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/src/main/webapp/disc.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -26,7 +26,8 @@
<tr:inputNumberSpinbox label="Release Date"
value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1"
readOnly="#{not identity.loggedIn}" />
<tr:selectOneChoice value="#{disc.artist}"
label="Artist" required="true" readOnly="#{not identity.loggedIn}">
<s:selectItems
value="#{allArtists.resultList}" var="artist" label="#{artist.name}"
noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
</tr:selectOneChoice>
<tr:panelLabelAndMessage label="Details">
<tr:inputText simple="true"
value="#{disc.description}" rendered="#{identity.loggedIn}" rows="4"
columns="60" id="description">
Modified:
branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/seampay/seampay-web/src/main/webapp/search.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -132,7 +132,8 @@
<h:selectOneRadio id="radioList"
layout="lineDirection"
value="#{newPayment.paymentFrequency}">
- <s:convertEnum />
+ <!--<s:convertEnum /> -->
+ <f:converter
converterId="org.jboss.seam.ui.EnumConverter" />
<s:enumItem id="once" enumValue="ONCE"
label="Only Once" />
<s:enumItem id="everyMinute"
enumValue="EVERY_MINUTE" label="Every Minute (testing)" />
<s:enumItem id="hourly" enumValue="HOURLY"
label="Every Hour (testing)" />
Modified:
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/src/main/webapp/imagepermissiondetail.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -54,7 +54,8 @@
<div class="selectMany">
<h:selectManyListbox id="friends"
value="#{imagePermission.selectedFriends}" styleClass="roles" size="6">
<s:selectItems value="#{imagePermission.availableFriends}"
var="friend" label="#{friend.memberName}"/>
- <s:convertEntity />
+ <!--<s:convertEntity />-->
+ <f:converter converterId="org.jboss.seam.ui.EntityConverter"
/>
</h:selectManyListbox>
</div>
<div class="validationError"><h:message for="friends"/></div>
Modified:
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -29,7 +29,8 @@
</f:facet>
<h:selectOneMenu value="#{country.continent}">
<s:selectItems
value="#{continents.resultList}" var="continent" label="#{continent.name}" />
- <s:convertEntity />
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
+ <!-- <s:convertEntity /> -->
</h:selectOneMenu>
</h:column>
</h:dataTable>
Modified:
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -27,7 +27,8 @@
<ui:define name="label">Title</ui:define>
<h:selectOneMenu value="#{person.honorific}">
<s:selectItems value="#{honorifics}"
var="honorific" label="#{honorific.label}" noSelectionLabel="Please select" />
- <s:convertEnum />
+ <f:converter
converterId="org.jboss.seam.ui.EnumConverter" />
+<!-- look above how JSF 2 changed, no need to create custom Tag
<s:convertEnum /> -->
</h:selectOneMenu>
</s:decorate>
@@ -41,15 +42,17 @@
<ui:define name="label">Continent of Birth</ui:define>
<h:selectOneMenu
value="#{personHome.instance.continent}" required="true" id="continent">
<s:selectItems value="#{continents.resultList}"
var="continent" label="#{continent.name}" noSelectionLabel="Please Select..."/>
- <s:convertEntity />
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneMenu>
</s:decorate>
<s:decorate template="decorateField.xhtml">
<ui:define name="label">Country of Birth</ui:define>
<h:selectOneRadio
value="#{personHome.instance.country}" required="true" disabled="#{empty
person.continent}">
- <s:selectItems
value="#{personHome.instance.continent.countries}" var="country"
label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please
Select..." hideNoSelectionLabel="true"/>
- <s:convertEntity />
+ <s:selectItems
value="#{personHome.instance.continent.countries}" var="country"
label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please
Select..." hideNoSelectionLabel="true"
converter="org.jboss.seam.ui.EntityConverter"/>
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneRadio>
</s:decorate>
@@ -57,7 +60,8 @@
<ui:define name="label">Roles</ui:define>
<h:selectManyCheckbox value="#{person.roles}" required="true"
collectionType="java.util.ArrayList">
<s:selectItems value="#{roles}" var="role"
label="#{role.name}"/>
- <s:convertEnum />
+ <f:converter converterId="org.jboss.seam.ui.EnumConverter"
/>
+<!-- <s:convertEnum /> -->
</h:selectManyCheckbox>
</s:decorate>
@@ -82,8 +86,9 @@
<ui:define name="label">Favourite Colours</ui:define>
<ui:define name="description">A colour is an
entity</ui:define>
<h:selectManyListbox
value="#{personHome.instance.favouriteColours}"
collectionType="java.util.ArrayList">
- <s:selectItems value="#{colours.resultList}"
var="colour" label="#{colour.name}" />
- <s:convertEntity />
+ <s:selectItems value="#{colours.resultList}"
var="colour" label="#{colour.name}"/>
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectManyListbox>
</s:decorate>
@@ -91,8 +96,9 @@
<ui:define name="label">Favourite Book</ui:define>
<ui:define name="description">A book has a composite
key</ui:define>
<h:selectOneListbox value="#{person.favouriteBook}" >
- <s:selectItems value="#{books.resultList}"
var="book" label="#{book.name} by #{book.author} (#{book.nationality})" />
- <s:convertEntity />
+ <s:selectItems value="#{books.resultList}"
var="book" label="#{book.name} by #{book.author} (#{book.nationality})"/>
+ <f:converter
converterId="org.jboss.seam.ui.EntityConverter" />
+<!-- <s:convertEntity /> -->
</h:selectOneListbox>
</s:decorate>
@@ -100,7 +106,7 @@
<ui:define name="label">Favourite Film</ui:define>
<ui:define name="description">Film uses
<code>@Converter(forClass="...")</code> - there is no converter specified in
the facelet</ui:define>
<h:selectOneListbox value="#{person.favouriteFilm}">
- <s:selectItems value="#{films.resultList}"
var="film" label="#{film.name} directed by #{film.director}"
noSelectionLabel="Please Select..."/>
+ <s:selectItems value="#{films.resultList}"
var="film" label="#{film.name} directed by #{film.director}"
noSelectionLabel="Please Select..." />
</h:selectOneListbox>
</s:decorate>
Modified:
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
2012-05-21 11:04:12 UTC (rev 14710)
+++
branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml
2012-05-21 11:04:51 UTC (rev 14711)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
xmlns:s="http://jboss.org/schema/seam/taglib";>
-<head>
+<h:head>
<title>UI Example: #{tagName}</title>
<link href="date.css" rel="stylesheet" type="text/css" />
<style type="text/css">
@@ -67,7 +67,7 @@
}
</style>
<ui:debug id="debug" />
-</head>
+</h:head>
<body>
<s:div styleClass="menu">
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
