[portal-commits] JBoss Portal SVN: r11382 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src: resources/portal-wsrp-admin-war/WEB-INF/classes and 2 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-07-09 15:04:36 -0400 (Wed, 09 Jul 2008) New Revision: 11382 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml Log: - JBPORTAL-2064: Added feedback for producer configuration operations. - Fixed improperly closed EL expression. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-07-09 18:50:28 UTC (rev 11381) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-07-09 19:04:36 UTC (rev 11382) @@ -177,6 +177,7 @@ getRegRequirements().reloadPolicyFrom(policyClassName, validatorClassName); } configurationService.saveConfiguration(); + beanContext.createInfoMessage("bean_producer_save_success"); } catch (Exception e) { @@ -191,6 +192,7 @@ try { configurationService.reloadConfiguration(); + beanContext.createInfoMessage("bean_producer_cancel_success"); } catch (Exception e) { Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-07-09 18:50:28 UTC (rev 11381) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-07-09 19:04:36 UTC (rev 11382) @@ -135,7 +135,7 @@ ## Localized messages in JSF beans bean_support_unexpected_error = An unexpected error occured: -bean_support_cause = Cause: +bean_support_cause = Cause: # ConsumerBean bean_consumer_cannot_find_consumer = Couldn't find consumer ''{0}''! @@ -153,9 +153,11 @@ bean_consumermanager_refresh_bypassed = Refresh was not necessary. bean_consumermanager_refresh_success = Refresh was successful. bean_consumermanager_refresh_failure = Refresh failed (probably because the registration information was not valid). -bean_consumermanager_refresh_exception = An unexpected error occurred. +bean_consumermanager_refresh_exception = An unexpected error occurred. # ProducerBean bean_producer_regpolicy_unset = RegistrationPolicy unset bean_producer_cannot_save = Couldn't save producer configuration. Cause: {0} -bean_producer_cannot_reload = Couldn't reload producer configuration. Cause: {0} \ No newline at end of file +bean_producer_cannot_reload = Couldn't reload producer configuration. Cause: {0} +bean_producer_save_success = Producer configuration successfully saved! +bean_producer_cancel_success = All modifications made to the producer configuration have been cancelled! Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-07-09 18:50:28 UTC (rev 11381) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-07-09 19:04:36 UTC (rev 11382) @@ -130,4 +130,6 @@ bean_consumermanager_refresh_bypassed=Le rafra\u00eechissement n'\u00e9tait pas requis. bean_consumermanager_refresh_exception=Une erreur inattendue s'est produite. bean_consumermanager_refresh_failure=Le rafra\u00eechissement a \u00e9chou\u00e9 (probablement \u00e0 cause d'informations d'enregistrement non valides) -bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi. \ No newline at end of file +bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi. +bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du producteur ont \u00e9t\u00e9 annull\u00e9es! +bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9 sauvegard\u00e9e! \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml 2008-07-09 18:50:28 UTC (rev 11381) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml 2008-07-09 19:04:36 UTC (rev 11382) @@ -12,13 +12,13 @@ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> <h3> - <h:outputFormat value="#{i18n.confirm_delete_registration_title"> + <h:outputFormat value="#{i18n.confirm_delete_registration_title}"> <f:param value="#{consumer.id}"/> </h:outputFormat> </h3> <p class="portlet-msg-alert"> - <h:outputFormat value="#{i18n.confirm_delete_registration_message"> + <h:outputFormat value="#{i18n.confirm_delete_registration_message}"> <f:param value="#{consumer.id}"/> </h:outputFormat> </p> @@ -26,7 +26,8 @@ <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p> <h:form> - <h:commandButton value="#{i18n.confirm_delete_registration_submit}" action="#{consumer.eraseLocalRegistration}" + <h:commandButton value="#{i18n.confirm_delete_registration_submit}" + action="#{consumer.eraseLocalRegistration}" styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer" styleClass="portlet-form-button portlet-section-buttonrow"/> @@ -36,4 +37,4 @@ </ui:define> -</ui:decorate> \ No newline at end of file +</ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-07-09 18:50:28 UTC (rev 11381) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-07-09 19:04:36 UTC (rev 11382) @@ -10,7 +10,7 @@ <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li> <li id="currentTab">#{i18n.nav_tabs_producer_config}</li> <ui:remove> - <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li> + <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li> </ui:remove> </ul> </h:form>