Seam SVN: r10771 - examples/trunk/booking/ear.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 19:56:20 -0400 (Mon, 04 May 2009)
New Revision: 10771
Modified:
examples/trunk/booking/ear/pom.xml
Log:
note
Modified: examples/trunk/booking/ear/pom.xml
===================================================================
--- examples/trunk/booking/ear/pom.xml 2009-05-04 21:47:48 UTC (rev 10770)
+++ examples/trunk/booking/ear/pom.xml 2009-05-04 23:56:20 UTC (rev 10771)
@@ -46,6 +46,8 @@
<contextRoot>/seam-booking</contextRoot>
</webModule>
</modules>
+ <!-- unpackTypes works incrementally, so I don't have to sync from the ejb-jar/target and war/target in antrun -->
+ <!--<unpackTypes>war,ejb</unpackTypes>-->
<version>5</version>
</configuration>
</plugin>
16 years, 11 months
Seam SVN: r10770 - branches/community/Seam_2_1.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 17:47:48 -0400 (Mon, 04 May 2009)
New Revision: 10770
Modified:
branches/community/Seam_2_1/build.xml
Log:
add copyright.txt file in distribution
Modified: branches/community/Seam_2_1/build.xml
===================================================================
--- branches/community/Seam_2_1/build.xml 2009-05-04 21:47:08 UTC (rev 10769)
+++ branches/community/Seam_2_1/build.xml 2009-05-04 21:47:48 UTC (rev 10770)
@@ -703,6 +703,7 @@
<target name="extras" depends="dependencyReport">
<copy file="readme.txt" todir="${dist.dir}" />
<copy file="lgpl.txt" todir="${dist.dir}" />
+ <copy file="copyright.txt" todir="${dist.dir}" />
<copy file="changelog.txt" todir="${dist.dir}" />
<propertyfile file="${dist.dir}/build.properties" comment="See build/sample.build.properties for properties you might want to set">
<entry key="mavenized" value="false" />
16 years, 11 months
Seam SVN: r10769 - branches/community/Seam_2_1.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 17:47:08 -0400 (Mon, 04 May 2009)
New Revision: 10769
Added:
branches/community/Seam_2_1/copyright.txt
Log:
add missing copyright file that is referenced by license headers
Added: branches/community/Seam_2_1/copyright.txt
===================================================================
--- branches/community/Seam_2_1/copyright.txt (rev 0)
+++ branches/community/Seam_2_1/copyright.txt 2009-05-04 21:47:08 UTC (rev 10769)
@@ -0,0 +1,32 @@
+JBoss Seam is Copyright 2005-2009, Red Hat Middleware LLC and individual
+contributors. It is licensed under the GNU LGPL except where otherwise
+noted in the source file's header.
+
+A summary of the individual contributors is given below. Any omission should
+be sent to Pete Muir <pmuir(a)redhat.com>.
+
+SCM Login(s) Name Role
+------------------------------------------------------------------------
+gavin Gavin King Project founder
+pmuir,pete.muir(a)jboss.org Pete Muir Project lead
+dan.j.allen Dan Allen
+max.andersen(a)jboss.com Max Rydahl Andersen
+jbalunas(a)redhat.com Jay Balunas
+cbauer,christian.bauer(a)jboss.com Christian Bauer
+ebernard Emmanuel Bernard
+sbryzak2,shane.bryzak(a)jboss.com Shane Bryzak
+matt.drees Matt Dress
+jguglielmin Judy Guglielmin
+jharting Jozef Hartinger
+theute Thomas Heute
+alesj Ales Justin
+nickarls Nickla Karlsson
+manaRH Marek Novotny
+jacob.orshalick Jacob Orshalick
+cpopetz Clint Popetz
+nrichards,norman.richards(a)jboss.com Norman Richards
+danielc.roth Daniel Roth
+myoungstrom Michael Youngstrom
+myuan Michael Yuan
+------------------------------------------------------------------------
+* JBoss is a registered trademark of Red Hat Middleware LLC
16 years, 11 months
Seam SVN: r10768 - modules/trunk/dist.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 17:45:40 -0400 (Mon, 04 May 2009)
New Revision: 10768
Added:
modules/trunk/dist/NOTICE.txt
modules/trunk/dist/apl.txt
modules/trunk/dist/copyright.txt
Log:
add Apache License 2.0 and NOTICE for Wicket Source files
add a copyright.txt file listing contributors
Added: modules/trunk/dist/NOTICE.txt
===================================================================
--- modules/trunk/dist/NOTICE.txt (rev 0)
+++ modules/trunk/dist/NOTICE.txt 2009-05-04 21:45:40 UTC (rev 10768)
@@ -0,0 +1,8 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for Apache Wicket source files. ==
+ =========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Added: modules/trunk/dist/apl.txt
===================================================================
--- modules/trunk/dist/apl.txt (rev 0)
+++ modules/trunk/dist/apl.txt 2009-05-04 21:45:40 UTC (rev 10768)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: modules/trunk/dist/copyright.txt
===================================================================
--- modules/trunk/dist/copyright.txt (rev 0)
+++ modules/trunk/dist/copyright.txt 2009-05-04 21:45:40 UTC (rev 10768)
@@ -0,0 +1,32 @@
+JBoss Seam is Copyright 2005-2009, Red Hat Middleware LLC and individual
+contributors. It is licensed under the GNU LGPL except where otherwise
+noted in the source file's header.
+
+A summary of the individual contributors is given below. Any omission should
+be sent to Pete Muir <pmuir(a)redhat.com>.
+
+SCM Login(s) Name Role
+------------------------------------------------------------------------
+gavin Gavin King Project founder
+pmuir,pete.muir(a)jboss.org Pete Muir Project lead
+dan.j.allen Dan Allen
+max.andersen(a)jboss.com Max Rydahl Andersen
+jbalunas(a)redhat.com Jay Balunas
+cbauer,christian.bauer(a)jboss.com Christian Bauer
+ebernard Emmanuel Bernard
+sbryzak2,shane.bryzak(a)jboss.com Shane Bryzak
+matt.drees Matt Dress
+jguglielmin Judy Guglielmin
+jharting Jozef Hartinger
+theute Thomas Heute
+alesj Ales Justin
+nickarls Nickla Karlsson
+manaRH Marek Novotny
+jacob.orshalick Jacob Orshalick
+cpopetz Clint Popetz
+nrichards,norman.richards(a)jboss.com Norman Richards
+danielc.roth Daniel Roth
+myoungstrom Michael Youngstrom
+myuan Michael Yuan
+------------------------------------------------------------------------
+* JBoss is a registered trademark of Red Hat Middleware LLC
16 years, 11 months
Seam SVN: r10767 - branches/community/Seam_2_1/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-05-04 12:15:31 -0400 (Mon, 04 May 2009)
New Revision: 10767
Modified:
branches/community/Seam_2_1/doc/Seam_Reference_Guide/en-US/Components.xml
Log:
JBSEAM-4154
Modified: branches/community/Seam_2_1/doc/Seam_Reference_Guide/en-US/Components.xml
===================================================================
--- branches/community/Seam_2_1/doc/Seam_Reference_Guide/en-US/Components.xml 2009-05-04 16:14:30 UTC (rev 10766)
+++ branches/community/Seam_2_1/doc/Seam_Reference_Guide/en-US/Components.xml 2009-05-04 16:15:31 UTC (rev 10767)
@@ -1090,13 +1090,7 @@
variables in the client instead of in the <literal>HttpSession</literal>.
</para>
</listitem>
- <listitem>
- <para>
- <literal>org.jboss.seam.core.init.userTransactionName</literal> — the JNDI
- name to use when looking up the JTA <literal>UserTransaction</literal> object.
- </para>
- </listitem>
- </itemizedlist>
+ </itemizedlist>
</listitem>
</varlistentry>
<varlistentry>
16 years, 11 months
Seam SVN: r10766 - branches/community/Seam_2_1/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-05-04 12:14:30 -0400 (Mon, 04 May 2009)
New Revision: 10766
Modified:
branches/community/Seam_2_1/src/main/org/jboss/seam/core-2.1.xsd
Log:
JBSEAM-4154
Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/core-2.1.xsd
===================================================================
--- branches/community/Seam_2_1/src/main/org/jboss/seam/core-2.1.xsd 2009-05-04 09:06:34 UTC (rev 10765)
+++ branches/community/Seam_2_1/src/main/org/jboss/seam/core-2.1.xsd 2009-05-04 16:14:30 UTC (rev 10766)
@@ -51,7 +51,6 @@
<xs:attribute name="jndi-pattern" type="components:string" />
<xs:attribute name="security-enabled" type="components:boolean" />
<xs:attribute name="transaction-management-enabled" type="components:boolean"/>
- <xs:attribute name="user-transaction-name" type="components:string"/>
</xs:attributeGroup>
<xs:element name="manager">
16 years, 11 months
Seam SVN: r10765 - branches/enterprise/JBPAPP_4_3_FP01/src/pdf/org/jboss/seam/pdf/ui.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-05-04 05:06:34 -0400 (Mon, 04 May 2009)
New Revision: 10765
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/pdf/org/jboss/seam/pdf/ui/UIDocument.java
Log:
JBPAPP-1969 - reset header and footer
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/pdf/org/jboss/seam/pdf/ui/UIDocument.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/pdf/org/jboss/seam/pdf/ui/UIDocument.java 2009-05-04 04:49:56 UTC (rev 10764)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/pdf/org/jboss/seam/pdf/ui/UIDocument.java 2009-05-04 09:06:34 UTC (rev 10765)
@@ -266,6 +266,8 @@
public void encodeEnd(FacesContext context)
throws IOException
{
+ document.resetHeader();
+ document.resetFooter();
document.close();
byte[] bytes = stream.toByteArray();
16 years, 11 months
Seam SVN: r10764 - in examples/trunk/booking/war/src/main/webapp: WEB-INF/fragments and 1 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 00:49:56 -0400 (Mon, 04 May 2009)
New Revision: 10764
Removed:
examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/user.xhtml
Modified:
examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/hotel.xhtml
examples/trunk/booking/war/src/main/webapp/confirm.xhtml
examples/trunk/booking/war/src/main/webapp/resources/property/display.xhtml
Log:
converter can be passed in as child rather than overriding entire output component
Modified: examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/hotel.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/hotel.xhtml 2009-05-04 04:39:28 UTC (rev 10763)
+++ examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/hotel.xhtml 2009-05-04 04:49:56 UTC (rev 10764)
@@ -15,10 +15,8 @@
<p:display label="Class" override="true">
<h:graphicImage value="/img/#{hotel.stars}-star.gif" style="padding-top: 4px;"/>
</p:display>
- <p:display label="Nightly rate" override="true">
- <h:outputText value="#{hotel.price}">
- <f:convertNumber type="currency" currencySymbol="$"/>
- </h:outputText>
+ <p:display label="Nightly rate" value="#{hotel.price}">
+ <f:convertNumber for="output" type="currency" currencySymbol="$"/>
</p:display>
</ui:composition>
Deleted: examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/user.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/user.xhtml 2009-05-04 04:39:28 UTC (rev 10763)
+++ examples/trunk/booking/war/src/main/webapp/WEB-INF/fragments/user.xhtml 2009-05-04 04:49:56 UTC (rev 10764)
@@ -1,21 +0,0 @@
-<!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:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:p="http://http://java.sun.com/jsf/composite/property">
-
- <p:display label="Name" value="#{hotel.name}"/>
- <p:display label="Address" value="#{hotel.address}"/>
- <p:display label="City" value="#{hotel.city}"/>
- <p:display label="State" value="#{hotel.state}"/>
- <p:display label="Zip" value="#{hotel.zip}"/>
- <p:display label="Country" value="#{hotel.country}"/>
- <p:display label="Nightly rate" override="true">
- <h:outputText value="#{hotel.price}">
- <f:convertNumber type="currency" currencySymbol="$"/>
- </h:outputText>
- </p:display>
-
-</ui:composition>
Modified: examples/trunk/booking/war/src/main/webapp/confirm.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/confirm.xhtml 2009-05-04 04:39:28 UTC (rev 10763)
+++ examples/trunk/booking/war/src/main/webapp/confirm.xhtml 2009-05-04 04:49:56 UTC (rev 10764)
@@ -17,22 +17,16 @@
<ui:include src="/WEB-INF/fragments/hotel.xhtml"/>
- <p:display label="Total payment" override="true">
- <h:outputText value="#{booking.total}">
- <f:convertNumber type="currency" currencySymbol="$"/>
- </h:outputText>
+ <p:display label="Total payment" value="#{booking.total}">
+ <f:convertNumber for="output" type="currency" currencySymbol="$"/>
</p:display>
- <p:display label="Check-in date" override="true">
- <h:outputText value="#{booking.checkinDate}">
- <f:convertDateTime type="date" pattern="MM/dd/yyyy"/>
- </h:outputText>
+ <p:display label="Check-in date" value="#{booking.checkinDate}">
+ <f:convertDateTime for="output" type="date" pattern="MM/dd/yyyy"/>
</p:display>
- <p:display label="Check-out date" override="true">
- <h:outputText value="#{booking.checkoutDate}">
- <f:convertDateTime type="date" pattern="MM/dd/yyyy"/>
- </h:outputText>
+ <p:display label="Check-out date" value="#{booking.checkoutDate}">
+ <f:convertDateTime for="output" type="date" pattern="MM/dd/yyyy"/>
</p:display>
<p:display label="Credit card #" value="#{booking.creditCard}"/>
Modified: examples/trunk/booking/war/src/main/webapp/resources/property/display.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/resources/property/display.xhtml 2009-05-04 04:39:28 UTC (rev 10763)
+++ examples/trunk/booking/war/src/main/webapp/resources/property/display.xhtml 2009-05-04 04:49:56 UTC (rev 10764)
@@ -13,7 +13,6 @@
<comp:attribute name="override" required="false" default="false"/>
</comp:interface>
- <!-- the override is a workaround because assigning an id to the output dynamically is not working -->
<!-- TODO allow for a template to be specified, falling back to a default -->
<comp:implementation>
<div class="entry">
@@ -21,7 +20,7 @@
<span class="output">
<c:choose>
<c:when test="#{cc.attrs.override}"><comp:insertChildren/></c:when>
- <c:otherwise>#{cc.attrs.value}</c:otherwise>
+ <c:otherwise><h:outputText id="output" value="#{cc.attrs.value}"><comp:insertChildren/></h:outputText></c:otherwise>
</c:choose>
</span>
</div>
16 years, 11 months
Seam SVN: r10763 - examples/trunk/booking/war/src/main/webapp.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 00:39:28 -0400 (Mon, 04 May 2009)
New Revision: 10763
Modified:
examples/trunk/booking/war/src/main/webapp/confirm.xhtml
Log:
format dates
Modified: examples/trunk/booking/war/src/main/webapp/confirm.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/confirm.xhtml 2009-05-04 04:33:40 UTC (rev 10762)
+++ examples/trunk/booking/war/src/main/webapp/confirm.xhtml 2009-05-04 04:39:28 UTC (rev 10763)
@@ -23,8 +23,18 @@
</h:outputText>
</p:display>
- <p:display label="Check-in date" value="#{booking.checkinDate}"/>
- <p:display label="Check-out date" value="#{booking.checkoutDate}"/>
+ <p:display label="Check-in date" override="true">
+ <h:outputText value="#{booking.checkinDate}">
+ <f:convertDateTime type="date" pattern="MM/dd/yyyy"/>
+ </h:outputText>
+ </p:display>
+
+ <p:display label="Check-out date" override="true">
+ <h:outputText value="#{booking.checkoutDate}">
+ <f:convertDateTime type="date" pattern="MM/dd/yyyy"/>
+ </h:outputText>
+ </p:display>
+
<p:display label="Credit card #" value="#{booking.creditCard}"/>
<div class="buttonBox">
16 years, 11 months
Seam SVN: r10762 - examples/trunk/booking/war/src/main/webapp.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-04 00:33:40 -0400 (Mon, 04 May 2009)
New Revision: 10762
Modified:
examples/trunk/booking/war/src/main/webapp/book.xhtml
Log:
use <f:selectItems> rather than hard-coding options
Modified: examples/trunk/booking/war/src/main/webapp/book.xhtml
===================================================================
--- examples/trunk/booking/war/src/main/webapp/book.xhtml 2009-05-04 04:33:25 UTC (rev 10761)
+++ examples/trunk/booking/war/src/main/webapp/book.xhtml 2009-05-04 04:33:40 UTC (rev 10762)
@@ -61,25 +61,10 @@
<p:edit id="creditCardExpiry" label="Credit card expiry">
<h:selectOneMenu id="input" 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"/>
+ <f:selectItems value="#{months}" var="_month" itemValue="#{_month.number}" itemLabel="#{_month.shortName}"/>
</h:selectOneMenu>
<h:selectOneMenu id="input2" value="#{booking.creditCardExpiryYear}">
- <f:selectItem itemLabel="2009" itemValue="2009"/>
- <f:selectItem itemLabel="2010" itemValue="2010"/>
- <f:selectItem itemLabel="2011" itemValue="2011"/>
- <f:selectItem itemLabel="2012" itemValue="2012"/>
- <f:selectItem itemLabel="2013" itemValue="2013"/>
+ <f:selectItems value="#{creditCardExpiryYears}" var="_year" itemValue="#{_year}"/>
</h:selectOneMenu>
</p:edit>
16 years, 11 months