Author: chris.laprun(a)jboss.com Date: 2010-01-29 07:27:28 -0500 (Fri, 29 Jan 2010) New Revision: 1469 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_it.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_ja.properties components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_pt_BR.properties components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml Log: - Made WSDL mandatory and removed individual interface information in the UI as it's now the case in the endpoint configuration. - Removed the localization keys. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-01-29 12:27:28 UTC (rev 1469) @@ -31,7 +31,6 @@ import org.gatein.wsrp.consumer.RegistrationProperty; import org.gatein.wsrp.consumer.registry.ConsumerRegistry; -import javax.faces.context.FacesContext; import javax.faces.event.ValueChangeEvent; import java.net.MalformedURLException; import java.net.URL; @@ -48,7 +47,6 @@ { private WSRPConsumer consumer; private ConsumerRegistry registry; - private Boolean useWSDL = null; private ConsumerManagerBean manager; private boolean modified; private boolean registrationLocallyModified; @@ -67,11 +65,6 @@ private static final String UPDATE_SUCCESS = "bean_consumer_update_success"; private static final String CONSUMER_TYPE = "CONSUMER_TYPE"; - public ConsumerBean() - { - useWSDL = Boolean.TRUE; // use WSDL by default - } - public void setRegistry(ConsumerRegistry registry) { this.registry = registry; @@ -87,16 +80,6 @@ return modified || getProducerInfo().isModifyRegistrationRequired() || isRegistrationLocallyModified(); } - public boolean isUseWSDL() - { - return true; - } - - public void setUseWSDL(boolean useWSDL) - { - this.useWSDL = useWSDL ? Boolean.TRUE : Boolean.FALSE; - } - public boolean isRefreshNeeded() { return consumer.isRefreshNeeded(); @@ -485,14 +468,6 @@ // Listeners - public void useWSDLListener(ValueChangeEvent event) - { - useWSDL = (Boolean)modifyIfNeeded(useWSDL, event.getNewValue(), "wsdl", false); - - // bypass the rest of the life cycle and re-display page - FacesContext.getCurrentInstance().renderResponse(); - } - // todo: valueChangeListener not needed anymore when events on RegistrationProperties work public void regPropListener(ValueChangeEvent event) Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2009, Red Hat Middleware, LLC, and individual +# Copyright 2010, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -81,11 +81,6 @@ edit_consumer_cache = Cache expiration: edit_consumer_cache_seconds = (seconds before expiration) edit_consumer_endpoint = Endpoint configuration: -edit_consumer_endpoint_wsdl = Use WSDL? -edit_consumer_endpoint_sd = Service Description URL: -edit_consumer_endpoint_m = Markup URL: -edit_consumer_endpoint_r = Registration URL: -edit_consumer_endpoint_pm = Portlet Management URL: edit_consumer_registration = Registration information: edit_consumer_registration_current = Current registration information: edit_consumer_prop_name = Name Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2009, Red Hat Middleware, LLC, and individual +# Copyright 2010, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -66,11 +66,6 @@ edit_consumer_cache_seconds=(secondes avant expiration) edit_consumer_cancel=Annuler edit_consumer_endpoint=Configuration du endpoint: -edit_consumer_endpoint_m=URL Markup: -edit_consumer_endpoint_pm=URL Portlet Management: -edit_consumer_endpoint_r=URL Registration: -edit_consumer_endpoint_sd=URL Service Description: -edit_consumer_endpoint_wsdl=Utiliser WSDL? edit_consumer_no_registration=Enregistrement non-requis par le producteur. edit_consumer_producer=Identifiant du producteur: edit_consumer_prop_desc=Description Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_it.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_it.properties 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_it.properties 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2009, Red Hat Middleware, LLC, and individual +# Copyright 2010, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -81,11 +81,6 @@ edit_consumer_cache = Scadenza della cache: edit_consumer_cache_seconds = (secondi prima della scadenza) edit_consumer_endpoint = Configurazione dell\'Endpoint: -edit_consumer_endpoint_wsdl = Uso il WSDL? -edit_consumer_endpoint_sd = Service Description URL: -edit_consumer_endpoint_m = Markup URL: -edit_consumer_endpoint_r = Registration URL: -edit_consumer_endpoint_pm = Portlet Management URL: edit_consumer_registration = Informazioni sulla registratione: edit_consumer_registration_current = Informazioni sulla registratione corrente: edit_consumer_prop_name = Nome Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_ja.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_ja.properties 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_ja.properties 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2009, Red Hat Middleware, LLC, and individual +# Copyright 2010, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -80,11 +80,6 @@ edit_consumer_cache = \u30ad\u30e3\u30c3\u30b7\u30e5\u6709\u52b9\u671f\u9650: edit_consumer_cache_seconds = (\u6709\u52b9\u671f\u9650\u524d\u306e\u79d2\u6570) edit_consumer_endpoint = \u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u8a2d\u5b9a: -edit_consumer_endpoint_wsdl = WSDL\u3092\u4f7f\u7528\uff1f -edit_consumer_endpoint_sd = \u30b5\u30fc\u30d3\u30b9\u8a18\u8ff0URL: -edit_consumer_endpoint_m = \u30de\u30fc\u30af\u30a2\u30c3\u30d7URL: -edit_consumer_endpoint_r = \u767b\u9332URL: -edit_consumer_endpoint_pm = \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u7ba1\u7406URL: edit_consumer_registration = \u767b\u9332\u60c5\u5831: edit_consumer_registration_current = \u73fe\u884c\u306e\u767b\u9332\u60c5\u5831: edit_consumer_prop_name = \u540d\u524d Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_pt_BR.properties =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_pt_BR.properties 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_pt_BR.properties 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ # # JBoss, a division of Red Hat -# Copyright 2009, Red Hat Middleware, LLC, and individual +# Copyright 2010, Red Hat Middleware, LLC, and individual # contributors as indicated by the @authors tag. See the # copyright.txt in the distribution for a full listing of # individual contributors. @@ -76,11 +76,6 @@ edit_consumer_cache = Expira\u00e7\u00e3o do cache\: edit_consumer_cache_seconds = (segundos antes de expirar) edit_consumer_endpoint = Configura\u00e7\u00e3o do endpoint\: -edit_consumer_endpoint_wsdl = Utilizar WSDL? -edit_consumer_endpoint_sd = URL do Service Description\: -edit_consumer_endpoint_m = URL do Markup\: -edit_consumer_endpoint_r = URL do Registro\: -edit_consumer_endpoint_pm = URL do Portlet de Gerenciamento\: edit_consumer_registration = Informa\u00e7\u00f5es do registro\: edit_consumer_registration_current = Informa\u00e7\u00f5es do registro atual\: edit_consumer_prop_name = Nome Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-01-29 10:36:38 UTC (rev 1468) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-01-29 12:27:28 UTC (rev 1469) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ Copyright 2010, Red Hat Middleware, LLC, and individual ~ contributors as indicated by the @authors tag. See the ~ copyright.txt in the distribution for a full listing of ~ individual contributors. @@ -26,145 +26,48 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> -<ui:param name="title" value=""/> + <ui:param name="title" value=""/> -<ui:define name="content"> + <ui:define name="content"> - <hr/> + <hr/> - <h:form id="edit-cons-form"> - <table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}"> - <tr> - <th>#{i18n.edit_consumer_producer}</th> - <td> - <h:inputText id="id" value="#{consumer.id}"/> - <h:message styleClass="portlet-msg-error" for="id"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_cache}</th> - <td> - <h:inputText id="cache" value="#{consumer.cache}"/> - #{i18n.edit_consumer_cache_seconds} - <h:message styleClass="portlet-msg-error" for="cache"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint}</th> - <td> - <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onclick="this.form.submit()" - valueChangeListener="#{consumer.useWSDLListener}" - immediate="true"/> - #{i18n.edit_consumer_endpoint_wsdl} - <h:message styleClass="portlet-msg-error" for="useWSDL"/> - - <h:panelGroup rendered="#{consumer.useWSDL}"> - <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> - <h:message styleClass="portlet-msg-error" - for="wsdl"/> - </h:panelGroup> - - <h:panelGroup rendered="#{!consumer.useWSDL}"> - <table border="0" class='portlet-table-body'> - <tr> - <th>#{i18n.edit_consumer_endpoint_sd}</th> - <td> - <h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> - <h:message - styleClass="portlet-msg-error" for="sd"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_m}</th> - <td> - <h:inputText id="m" size="70" value="#{consumer.markup}"/> - <h:message - styleClass="portlet-msg-error" for="m"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_r}</th> - <td> - <h:inputText id="r" size="70" value="#{consumer.registration}"/> - <h:message - styleClass="portlet-msg-error" - for="r"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_pm}</th> - <td> - <h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> - <h:message - styleClass="portlet-msg-error" for="pm"/> - </td> - </tr> - </table> - </h:panelGroup> - </td> - </tr> - <c:if test="#{consumer.localInfoPresent}"> + <h:form id="edit-cons-form"> + <table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}"> <tr> - <th>#{i18n.edit_consumer_registration}</th> + <th>#{i18n.edit_consumer_producer}</th> <td> - <c:choose> - <c:when test="#{consumer.localInfoPresent}"> - <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3> - <h:panelGroup styleClass="portlet-area-body"> - <c:choose> - <c:when test="#{consumer.registrationPropertiesEmpty}"> - <h:dataTable id="existingProps" - value="#{consumer.registrationProperties}" var="prop" - rowClasses="portlet-section-body,portlet-section-alternate" - columnClasses="nameColumn,descColumn," - headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" - styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" - width="100%"> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> - #{prop.name} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> - #{prop.description.label.value} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> - <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work --> - <h:inputText id="prop-value-input" value="#{prop.value}" size="50" - valueChangeListener="#{consumer.regPropListener}" - disabled="#{consumer.registrationModified}"/> - <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" - rendered="#{prop.determinedInvalid}" - converter="faces.convert.RegistrationProperty.Status"/> - </h:column> - </h:dataTable> - <h:commandLink id="cons-update-link" action="#{consumer.update}" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="#{consumer.registered}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - </c:when> - <c:otherwise> - #{i18n.edit_consumer_registration_no_props} - </c:otherwise> - </c:choose> - <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - rendered="#{consumer.registrationLocallyModified}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - <br style="clear:both;"/> - </h:panelGroup> - - <br/> - - <c:if test="#{consumer.registrationModified}"> - <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3> + <h:inputText id="id" value="#{consumer.id}"/> + <h:message styleClass="portlet-msg-error" for="id"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_cache}</th> + <td> + <h:inputText id="cache" value="#{consumer.cache}"/> + #{i18n.edit_consumer_cache_seconds} + <h:message styleClass="portlet-msg-error" for="cache"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_endpoint}</th> + <td> + <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> + <h:message styleClass="portlet-msg-error" for="wsdl"/> + </td> + </tr> + <c:if test="#{consumer.localInfoPresent}"> + <tr> + <th>#{i18n.edit_consumer_registration}</th> + <td> + <c:choose> + <c:when test="#{consumer.localInfoPresent}"> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3> <h:panelGroup styleClass="portlet-area-body"> <c:choose> - <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}"> - <h:dataTable id="expectedProps" - value="#{consumer.expectedRegistrationProperties}" var="prop" + <c:when test="#{consumer.registrationPropertiesEmpty}"> + <h:dataTable id="existingProps" + value="#{consumer.registrationProperties}" var="prop" rowClasses="portlet-section-body,portlet-section-alternate" columnClasses="nameColumn,descColumn," headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" @@ -180,59 +83,109 @@ </h:column> <h:column> <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> - <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/> + <!-- todo: valueChangeListener not needed anymore when events on RegistrationProperties work --> + <h:inputText id="prop-value-input" value="#{prop.value}" size="50" + valueChangeListener="#{consumer.regPropListener}" + disabled="#{consumer.registrationModified}"/> <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" rendered="#{prop.determinedInvalid}" converter="faces.convert.RegistrationProperty.Status"/> </h:column> </h:dataTable> + <h:commandLink id="cons-update-link" action="#{consumer.update}" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}" + styleClass="portlet-form-button portlet-section-buttonrow"/> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" + <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" value="#{i18n.edit_consumer_registration_modify}" + rendered="#{consumer.registrationLocallyModified}" title="#{i18n.edit_consumer_registration_modify_title}" styleClass="portlet-form-button portlet-section-buttonrow"/> <br style="clear:both;"/> </h:panelGroup> - </c:if> - </c:when> - <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}"> - #{i18n.edit_consumer_no_registration} - </c:when> - </c:choose> - </td> - </tr> - <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}"> - <tr> - <th>#{i18n.edit_consumer_registration_context}</th> - <td id="handle"> - #{i18n.edit_consumer_registration_context_handle} - <h:outputText - value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" - value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}" - styleClass="portlet-form-button"/> + + <br/> + + <c:if test="#{consumer.registrationModified}"> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3> + <h:panelGroup styleClass="portlet-area-body"> + <c:choose> + <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}"> + <h:dataTable id="expectedProps" + value="#{consumer.expectedRegistrationProperties}" var="prop" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="nameColumn,descColumn," + headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" + styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" + width="100%"> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> + #{prop.name} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> + #{prop.description.label.value} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> + <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/> + <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" + rendered="#{prop.determinedInvalid}" + converter="faces.convert.RegistrationProperty.Status"/> + </h:column> + </h:dataTable> + </c:when> + <c:otherwise> + #{i18n.edit_consumer_registration_no_props} + </c:otherwise> + </c:choose> + <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <br style="clear:both;"/> + </h:panelGroup> + </c:if> + </c:when> + <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}"> + #{i18n.edit_consumer_no_registration} + </c:when> + </c:choose> </td> </tr> + <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}"> + <tr> + <th>#{i18n.edit_consumer_registration_context}</th> + <td id="handle"> + #{i18n.edit_consumer_registration_context_handle} + <h:outputText + value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> + <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}" + styleClass="portlet-form-button"/> + </td> + </tr> + </c:if> </c:if> - </c:if> - <tr> - <th/> - <td class="portlet-section-buttonrow"> - <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" - value="#{i18n.edit_consumer_refresh}" - title="#{i18n.edit_consumer_refresh_title}" - styleClass="portlet-form-button"/> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.edit_consumer_cancel}" immediate="true" - styleClass="portlet-form-button"/> - </td> - </tr> - </table> - </h:form> -</ui:define> + <tr> + <th/> + <td class="portlet-section-buttonrow"> + <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}" + styleClass="portlet-form-button"/> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.edit_consumer_cancel}" immediate="true" + styleClass="portlet-form-button"/> + </td> + </tr> + </table> + </h:form> + </ui:define> </ui:decorate>