October 2008 - seam-commits - Jboss List Archives

Seam SVN: r9184 - trunk/src/main/org/jboss/seam/init.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-03 12:24:02 -0400 (Fri, 03 Oct 2008) New Revision: 9184 Modified: trunk/src/main/org/jboss/seam/init/Initialization.java Log: JBSEAM-3481 Modified: trunk/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-03 13:29:52 UTC (rev 9183) +++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-03 16:24:02 UTC (rev 9184) @@ -21,6 +21,8 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -57,6 +59,8 @@ import org.jboss.seam.util.Strings; import org.jboss.seam.util.XML; +import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match; + /** * Builds configuration metadata when Seam first initialized. * @@ -137,25 +141,55 @@ throw new RuntimeException("error scanning META-INF/components.xml files", ioe); } + List<String> seenDocuments = new ArrayList<String>(); + Properties replacements = getReplacements(); - List<String> duplicateJarPatterns = new SeamDeploymentProperties(Thread.currentThread().getContextClassLoader()).getPropertyValues(DUPLICATE_JARS_PATTERNS); + Set<Pattern> duplicateJarPatterns = new HashSet<Pattern>(); + for (String duplicateJarRegex : new HashSet<String>(new SeamDeploymentProperties(Thread.currentThread().getContextClassLoader()).getPropertyValues(DUPLICATE_JARS_PATTERNS))) + { + duplicateJarPatterns.add(Pattern.compile(duplicateJarRegex)); + } while (resources.hasMoreElements()) { URL url = resources.nextElement(); boolean skip = false; - for (String regex : duplicateJarPatterns) + String path = url.getPath(); + String prefixPattern = "^(\\S*/)([\\S^/]*.jar)(\\S*)$"; + Pattern pattern = Pattern.compile(prefixPattern); + Matcher matcher = pattern.matcher(path); + String jarName; + String fileName; + if (matcher.matches()) { - String path = url.getPath(); - if (path.matches(regex)) + jarName = matcher.group(2); + fileName = matcher.group(3); + Set<String> documentNames = new HashSet<String>(); + for (Pattern duplicateJarPattern : duplicateJarPatterns) { - skip = true; + Matcher duplicateMatcher = duplicateJarPattern.matcher(jarName); + + if (duplicateMatcher.matches()) + { + jarName = duplicateMatcher.group(1); + } + + documentNames.add(jarName + fileName); } + for (String documentName : documentNames) + { + if (seenDocuments.contains(documentName)) + { + skip = true; + } + } + seenDocuments.addAll(documentNames); } + if (!skip) { try { - log.info("reading " + url); + log.debug("reading " + url); installComponentsFromXmlElements( XML.getRootElement( url.openStream() ), replacements ); } catch (Exception e) @@ -163,6 +197,10 @@ throw new RuntimeException("error while reading " + url, e); } } + else + { + log.trace("skipping read of duplicate components.xml " + url); + } } }

15 years, 6 months

1
0
0 / 0

Seam SVN: r9183 - branches/enterprise/JBPAPP_4_2_CP01/lib.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-10-03 09:29:52 -0400 (Fri, 03 Oct 2008) New Revision: 9183 Modified: branches/enterprise/JBPAPP_4_2_CP01/lib/jsf-api.jar branches/enterprise/JBPAPP_4_2_CP01/lib/jsf-impl.jar Log: JBPAPP-1129 Modified: branches/enterprise/JBPAPP_4_2_CP01/lib/jsf-api.jar =================================================================== (Binary files differ) Modified: branches/enterprise/JBPAPP_4_2_CP01/lib/jsf-impl.jar =================================================================== (Binary files differ)

15 years, 6 months

1
0
0 / 0

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

by seam-commits＠lists.jboss.org

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"> -  - <property name="concurrentRequestTimeout">500</property> -  - <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"?> - -<faces-config version="1.2" + + <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}"/>   <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">  @@ -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}"/>   <s:button id="revise" value="Revise" view="/book.xhtml"/>   - <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">  @@ -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"/>   - <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">  @@ -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}"/>   <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}"/>  + <ice:commandButton id="register" value="Register" action="#{register.register}"/>  <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>

15 years, 6 months

1
0
0 / 0

Seam SVN: r9181 - trunk/examples/remoting/chatroom/view.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-10-02 23:37:45 -0400 (Thu, 02 Oct 2008) New Revision: 9181 Modified: trunk/examples/remoting/chatroom/view/chatroom.js Log: JBSEAM-2953 Modified: trunk/examples/remoting/chatroom/view/chatroom.js =================================================================== --- trunk/examples/remoting/chatroom/view/chatroom.js 2008-10-03 03:24:23 UTC (rev 9180) +++ trunk/examples/remoting/chatroom/view/chatroom.js 2008-10-03 03:37:45 UTC (rev 9181) @@ -11,6 +11,7 @@ } var username = null; +var connectedFlag = false; var chatroom = Seam.Component.getInstance("chatroomAction"); function connect() { @@ -18,6 +19,7 @@ username = nameCtl.value; var connectCallback = function(connected, context) { + connectedFlag = true; setInterfaceState(connected); getObject("username").value = username; Seam.Remoting.getContext().setConversationId(context.getConversationId()); @@ -36,6 +38,7 @@ } function disconnect() { + connectedFlag = false; Seam.Remoting.unsubscribe("chatroomTopic"); setInterfaceState(false); chatroom.disconnect(); @@ -95,6 +98,11 @@ } function sendMessage() { + if (!connectedFlag) { + alert("Not connected"); + return; + } + var ctl = getObject("messageText"); chatroom.sendMessage(ctl.value); ctl.value = "";

15 years, 7 months

1
0
0 / 0

Seam SVN: r9180 - trunk/examples/remoting/helloworld/view.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-10-02 23:24:23 -0400 (Thu, 02 Oct 2008) New Revision: 9180 Modified: trunk/examples/remoting/helloworld/view/helloworld.xhtml Log: JBSEAM-2954 Modified: trunk/examples/remoting/helloworld/view/helloworld.xhtml =================================================================== --- trunk/examples/remoting/helloworld/view/helloworld.xhtml 2008-10-02 20:26:34 UTC (rev 9179) +++ trunk/examples/remoting/helloworld/view/helloworld.xhtml 2008-10-03 03:24:23 UTC (rev 9180) @@ -22,6 +22,7 @@ <script type="text/javascript"> function sayHello() { var name = prompt("What is your name?"); + if (name == null) return; var callback = function(result) { alert(result); }; Seam.Component.getInstance("helloAction").sayHello(name, callback); }

15 years, 7 months

1
0
0 / 0

Seam SVN: r9179 - trunk.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-10-02 16:26:34 -0400 (Thu, 02 Oct 2008) New Revision: 9179 Modified: trunk/seam-text.g Log: Sanitizing HTML form tags Modified: trunk/seam-text.g =================================================================== --- trunk/seam-text.g 2008-10-02 18:12:15 UTC (rev 9178) +++ trunk/seam-text.g 2008-10-02 20:26:34 UTC (rev 9179) @@ -107,6 +107,10 @@ * * 7. Not implemented filtering of CSS url() - it's an invalid value always. * + * 8. Removed all <form>, <input> and other form tags. Attackers might use them compromise "outer" forms when entering + * markup in a textarea. + * + * */ public static class DefaultSanitizer implements SeamTextParser.Sanitizer { @@ -128,12 +132,12 @@ protected java.util.Set<String> acceptableElements = new java.util.HashSet(java.util.Arrays.asList( "a", "abbr", "acronym", "address", "area", "b", "bdo", "big", "blockquote", - "br", "button", "caption", "center", "cite", "code", "col", "colgroup", "dd", - "del", "dfn", "dir", "div", "dl", "dt", "em", "fieldset", "font", "form", - "h1", "h2", "h3", "h4", "h5", "h6", "hr", "i", "img", "input", "ins", "kbd", - "label", "legend", "li", "map", "menu", "ol", "optgroup", "option", "p", - "pre", "q", "s", "samp", "select", "small", "span", "strike", "strong", - "sub", "sup", "table", "tbody", "td", "textarea", "tfoot", "th", "thead", + "br", "caption", "center", "cite", "code", "col", "colgroup", "dd", + "del", "dfn", "dir", "div", "dl", "dt", "em", "font", + "h1", "h2", "h3", "h4", "h5", "h6", "hr", "i", "img", "ins", "kbd", + "label", "legend", "li", "map", "menu", "ol", "p", + "pre", "q", "s", "samp", "small", "span", "strike", "strong", + "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "tt", "u", "ul", "var", "wbr" ));

15 years, 7 months

1
0
0 / 0

Seam SVN: r9178 - trunk.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-02 14:12:15 -0400 (Thu, 02 Oct 2008) New Revision: 9178 Modified: trunk/seam21migration.txt Log: Note redeploy event name change Modified: trunk/seam21migration.txt =================================================================== --- trunk/seam21migration.txt 2008-10-02 17:32:59 UTC (rev 9177) +++ trunk/seam21migration.txt 2008-10-02 18:12:15 UTC (rev 9178) @@ -133,4 +133,11 @@ All asynchronous are now wrapped in exception handling. By default, any exceptions which propagate out of the asynchronous call are caught and logged at -error level. The reference manual describes how to customize this behaviour. \ No newline at end of file +error level. The reference manual describes how to customize this behaviour. + + +Redeploy +-------- + +The org.jboss.seam.postInitialization event is no longer called on redeploy, +instead org.jboss.seam.postReInitialization is called. \ No newline at end of file

15 years, 7 months

1
0
0 / 0

Seam SVN: r9177 - in trunk: src/main/org/jboss/seam/contexts and 1 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-02 13:32:59 -0400 (Thu, 02 Oct 2008) New Revision: 9177 Modified: trunk/doc/Seam_Reference_Guide/en-US/Events.xml trunk/src/main/org/jboss/seam/contexts/ServletLifecycle.java trunk/src/main/org/jboss/seam/init/Initialization.java Log: JBSEAM-3489 Modified: trunk/doc/Seam_Reference_Guide/en-US/Events.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Events.xml 2008-10-02 17:20:56 UTC (rev 9176) +++ trunk/doc/Seam_Reference_Guide/en-US/Events.xml 2008-10-02 17:32:59 UTC (rev 9177) @@ -682,6 +682,7 @@ <listitem><para><literal>org.jboss.seam.beforePhase </literal>— called before the start of a JSF phase</para></listitem> <listitem><para><literal>org.jboss.seam.afterPhase </literal>— called after the end of a JSF phase</para></listitem> <listitem><para><literal>org.jboss.seam.postInitialization </literal>— called when Seam has initialized and started up all components</para></listitem> + <listitem><para><literal>org.jboss.seam.postReInitialization </literal>— called when Seam has re-initialized and started up all components after a redeploy</para></listitem> <listitem><para><literal>org.jboss.seam.postAuthenticate.<name> </literal>— called after a user is authenticated</para></listitem> <listitem><para><literal>org.jboss.seam.preAuthenticate.<name> </literal>— called before attempting to authenticate a user</para></listitem> <listitem><para><literal>org.jboss.seam.notLoggedIn</literal> — called there is no authenticated user and authentication is required</para></listitem> Modified: trunk/src/main/org/jboss/seam/contexts/ServletLifecycle.java =================================================================== --- trunk/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2008-10-02 17:20:56 UTC (rev 9176) +++ trunk/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2008-10-02 17:32:59 UTC (rev 9177) @@ -73,20 +73,37 @@ } } - public static void beginInitialization() + public static void beginReinitialization(HttpServletRequest request) { - log.debug(">>> Begin initialization"); + log.debug(">>> Begin re-initialization"); Contexts.applicationContext.set( new ApplicationContext( Lifecycle.getApplication() ) ); Contexts.eventContext.set( new BasicContext(ScopeType.EVENT) ); + Contexts.sessionContext.set( new SessionContext( new ServletRequestSessionMap(request) ) ); Contexts.conversationContext.set( new BasicContext(ScopeType.CONVERSATION) ); } - - public static void beginReinitialization(HttpServletRequest request) + + public static void endReinitialization() { - log.debug(">>> Begin re-initialization"); + Contexts.startup(ScopeType.APPLICATION); + + Events.instance().raiseEvent("org.jboss.seam.postReInitialization"); + + // Clean up contexts used during reinitialization + Contexts.destroy( Contexts.getConversationContext() ); + Contexts.conversationContext.set(null); + Contexts.destroy( Contexts.getEventContext() ); + Contexts.eventContext.set(null); + Contexts.sessionContext.set(null); + Contexts.applicationContext.set(null); + + log.debug("<<< End re-initialization"); + } + + public static void beginInitialization() + { + log.debug(">>> Begin initialization"); Contexts.applicationContext.set( new ApplicationContext( Lifecycle.getApplication() ) ); Contexts.eventContext.set( new BasicContext(ScopeType.EVENT) ); - Contexts.sessionContext.set( new SessionContext( new ServletRequestSessionMap(request) ) ); Contexts.conversationContext.set( new BasicContext(ScopeType.CONVERSATION) ); } Modified: trunk/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-02 17:20:56 UTC (rev 9176) +++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-02 17:32:59 UTC (rev 9177) @@ -719,7 +719,7 @@ Contexts.getApplicationContext().remove(Seam.getComponentName(Exceptions.class)); } - ServletLifecycle.endInitialization(); + ServletLifecycle.endReinitialization(); return this; }

15 years, 7 months

1
0
0 / 0

Seam SVN: r9176 - trunk/examples/wicket/src/web/org/jboss/seam/example/wicket.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-02 13:20:56 -0400 (Thu, 02 Oct 2008) New Revision: 9176 Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java Log: JBSEAM-3469 Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java =================================================================== --- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-10-02 12:44:00 UTC (rev 9175) +++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-10-02 17:20:56 UTC (rev 9176) @@ -3,9 +3,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.wicket.Component; import org.apache.wicket.PageParameters; -import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.extensions.yui.calendar.DateField; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -26,9 +24,10 @@ public class Book extends WebPage { - private static final List<String> bedOptions = Arrays.asList("One king-sized bed", "Two double beds", "Three beds"); + private static final List<String> bedOptionsDisplayValues = Arrays.asList("One king-sized bed", "Two double beds", "Three beds"); + private static final List<Integer> bedOptions = Arrays.asList(1, 2, 3); private static final List<String> monthOptions = Arrays.asList("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); - private static final List<String> yearOptions = Arrays.asList("2008", "2009"); + private static final List<Integer> yearOptions = Arrays.asList(2008, 2009); @In private Booking booking; @@ -55,15 +54,21 @@ add(new ComponentFeedbackPanel("messages", this)); add(new FormInputBorder("checkinDateBorder", "Check in date", new DateField("checkinDate").setRequired(true), new PropertyModel(booking, "checkinDate"), false)); add(new FormInputBorder("checkoutDateBorder", "Check out date", new DateField("checkoutDate").setRequired(true), new PropertyModel(booking, "checkoutDate"), false)); - add(new FormInputBorder("bedsBorder", "Room Preference", new DropDownChoice("beds", bedOptions) + add(new FormInputBorder("bedsBorder", "Room Preference", new DropDownChoice("beds", bedOptions, new IChoiceRenderer() { - @Override - protected Object convertChoiceIdToChoice(String id) + + public Object getDisplayValue(Object object) { - return bedOptions.indexOf(id); + return bedOptionsDisplayValues.get(((Integer) object - 1)); } + + public String getIdValue(Object object, int index) + { + return object.toString(); + } - }.setRequired(true), new PropertyModel(booking, "beds"))); + } + ).setRequired(true), new PropertyModel(booking, "beds"))); add(new FormInputBorder("smokingBorder", "Smoking Preference", new RadioChoice("smoking", Arrays.asList(new Boolean[] {true, false}), new IChoiceRenderer() {

15 years, 7 months

1
0
0 / 0

Seam SVN: r9175 - trunk/examples/spring/view.

by seam-commits＠lists.jboss.org

Author: jharting Date: 2008-10-02 08:44:00 -0400 (Thu, 02 Oct 2008) New Revision: 9175 Modified: trunk/examples/spring/view/book.xhtml trunk/examples/spring/view/conversations.xhtml trunk/examples/spring/view/main.xhtml trunk/examples/spring/view/password.xhtml trunk/examples/spring/view/register.xhtml Log: JBSEAM-3431 Added ids for spring example. Modified: trunk/examples/spring/view/book.xhtml =================================================================== --- trunk/examples/spring/view/book.xhtml 2008-10-02 12:40:13 UTC (rev 9174) +++ trunk/examples/spring/view/book.xhtml 2008-10-02 12:44:00 UTC (rev 9175) @@ -48,13 +48,13 @@ <s:validateAll> <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> + <s:span id="Error" styleClass="errors"/> </f:facet> <div class="entry"> <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="checkinDateDecorate"> <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" /> <br/> <s:message/> @@ -65,7 +65,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="checkoutDateDecorate"> <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" /> <br/> <s:message/> @@ -76,7 +76,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="bedsDecorate"> <h:selectOneMenu id="beds" value="#{booking.beds}"> <f:selectItem itemLabel="One king-size bed" itemValue="1"/> <f:selectItem itemLabel="Two double beds" itemValue="2"/> @@ -90,7 +90,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> <div id="radio" class="input"> - <s:decorate> + <s:decorate id="smokingDecorate"> <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> <f:selectItem itemLabel="Smoking" itemValue="true"/> <f:selectItem itemLabel="Non Smoking" itemValue="false"/> @@ -103,7 +103,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="creditCardDecorate"> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> </h:inputText> <br/> @@ -115,7 +115,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="creditCardNameDecorate"> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> </h:inputText> <br/> @@ -127,7 +127,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="creditCardExpiryDecorate"> <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> <f:selectItem itemLabel="Jan" itemValue="1"/> <f:selectItem itemLabel="Feb" itemValue="2"/> @@ -157,7 +157,7 @@ </s:validateAll> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="Messages" globalOnly="true"/> </div> <div class="entry"> Modified: trunk/examples/spring/view/conversations.xhtml =================================================================== --- trunk/examples/spring/view/conversations.xhtml 2008-10-02 12:40:13 UTC (rev 9174) +++ trunk/examples/spring/view/conversations.xhtml 2008-10-02 12:44:00 UTC (rev 9175) @@ -12,19 +12,19 @@ </div> <div class="section"> - <h:form> - <h:dataTable value="#{conversationList}" var="entry"> - <h:column> - <h:commandLink action="#{entry.select}" value="#{entry.description}"/> + <h:form id="ConversationListForm"> + <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/>   - <h:outputText value="[current]" rendered="#{entry.current}"/> + <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> </h:column> - <h:column> - <h:outputText value="#{entry.startDatetime}"> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> - - <h:outputText value="#{entry.lastDatetime}"> + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> <s:convertDateTime type="time" pattern="hh:mm"/> </h:outputText> </h:column> Modified: trunk/examples/spring/view/main.xhtml =================================================================== --- trunk/examples/spring/view/main.xhtml 2008-10-02 12:40:13 UTC (rev 9174) +++ trunk/examples/spring/view/main.xhtml 2008-10-02 12:44:00 UTC (rev 9175) @@ -12,7 +12,7 @@ <h:form id="main"> <span class="errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </span> <h1>Search Hotels</h1> @@ -36,7 +36,7 @@ <div class="section"> - <h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:outputText id="NoHotelsFoundMessage" 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> @@ -59,7 +59,7 @@ <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}"/> + <s:link id="MoreResultsLink" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> </div> <div class="section"> Modified: trunk/examples/spring/view/password.xhtml =================================================================== --- trunk/examples/spring/view/password.xhtml 2008-10-02 12:40:13 UTC (rev 9174) +++ trunk/examples/spring/view/password.xhtml 2008-10-02 12:44:00 UTC (rev 9175) @@ -12,13 +12,13 @@ <h1>Change Your Password</h1> </div> <div class="section"> - <h:form id="password"> + <h:form id="setpassword"> <f:facet name="afterInvalidField"> - <s:message/> + <s:message id="Message"/> </f:facet> <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> + <s:span id="Error" styleClass="errors"/> </f:facet> <fieldset> @@ -26,7 +26,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="password">New Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="PasswordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"> <s:validate /> </h:inputSecret> @@ -38,7 +38,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="password">Old Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="VerifyDecorate"> <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> <br/> </s:decorate> @@ -46,7 +46,7 @@ </div> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="Messages" globalOnly="true"/> </div> <div class="entry"> Modified: trunk/examples/spring/view/register.xhtml =================================================================== --- trunk/examples/spring/view/register.xhtml 2008-10-02 12:40:13 UTC (rev 9174) +++ trunk/examples/spring/view/register.xhtml 2008-10-02 12:44:00 UTC (rev 9175) @@ -46,7 +46,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="usernameDecorate"> <h:inputText id="username" value="#{user.username}" required="true"> <a:support event="onblur" reRender="usernameErrors"/> </h:inputText> @@ -59,7 +59,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="nameDecorate"> <h:inputText id="name" value="#{user.name}" required="true"> <a:support event="onblur" reRender="nameErrors"/> </h:inputText> @@ -72,7 +72,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="passwordDecorate"> <h:inputSecret id="password" value="#{user.password}" required="true"/> <br/> <h:message for="password"/> @@ -83,7 +83,7 @@ <div class="entry"> <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> <div class="input"> - <s:decorate> + <s:decorate id="verifyDecorate"> <h:inputSecret id="verify" value="#{register.verify}" required="true"/> <br/> <h:message for="verify"/> @@ -94,7 +94,7 @@ </s:validateAll> <div class="entry errors"> - <h:messages globalOnly="true"/> + <h:messages id="messages" globalOnly="true"/> </div> <div class="entry">

15 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits October 2008