Author: chris.laprun(a)jboss.com Date: 2008-06-06 13:41:24 -0400 (Fri, 06 Jun 2008) New Revision: 10938 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java 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/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml Log: - More internalization: still need to improve the status handling after a consumer refresh as it is currently hardcoded. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -29,6 +29,8 @@ import org.jboss.portal.wsrp.admin.ui.BeanContext; import org.jboss.portal.wsrp.admin.ui.ConsumerBean; +import java.util.Locale; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -91,5 +93,10 @@ { return null; } + + protected Locale getLocale() + { + return Locale.getDefault(); + } } } Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/BeanContext.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -23,6 +23,10 @@ package org.jboss.portal.wsrp.admin.ui; +import java.text.MessageFormat; +import java.util.Locale; +import java.util.ResourceBundle; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -30,7 +34,10 @@ */ public abstract class BeanContext { - private static final String STATUS = "status"; + protected static final String STATUS = "status"; + private static final String RESOURCE_NAME = "WSRPConfigurationResource"; + private static final String UNEXPECTED_ERROR = "bean_support_unexpected_error"; + private static final String CAUSE = "bean_support_cause"; protected abstract String getParameter(String key); @@ -40,16 +47,31 @@ protected abstract Object getInfoSeverity(); - protected void createErrorMessage(String message) + protected abstract Locale getLocale(); + + protected void createErrorMessage(String message, Object... params) { - createMessage(STATUS, message, getErrorSeverity()); + createLocalizedMessage(STATUS, message, getErrorSeverity(), params); } - protected void createErrorMessage(String target, String message) + protected void createErrorMessage(String target, String message, Object... params) { - createMessage(target, message, getErrorSeverity()); + createLocalizedMessage(target, message, getErrorSeverity(), params); } + protected void createLocalizedMessage(String target, String message, Object severity, Object... params) + { + String localizedMessage = MessageFormat.format(getMessageFromBundle(message), params); + createMessage(target, localizedMessage, severity); + } + + protected String getMessageFromBundle(String message) + { + Locale locale = getLocale(); + ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_NAME, locale); + return rb.getString(message); + } + protected void createErrorMessageFrom(Exception e) { createErrorMessageFrom(STATUS, e); @@ -59,8 +81,8 @@ { Throwable cause = e.getCause(); String localizedMessage = getLocalizedMessageOrExceptionName(e); - String message = localizedMessage + (cause != null ? "\nCause: " + getLocalizedMessageOrExceptionName(cause) : ""); - createErrorMessage(target, message); + String message = localizedMessage + (cause != null ? "\n" + getMessageFromBundle(CAUSE) + getLocalizedMessageOrExceptionName(cause) : ""); + createMessage(target, message, getErrorSeverity()); } private String getLocalizedMessageOrExceptionName(Throwable e) @@ -68,14 +90,14 @@ String localizedMessage = e.getLocalizedMessage(); if (localizedMessage == null) { - localizedMessage = "An unexpected error occured: " + e.getClass().getName(); + localizedMessage = getMessageFromBundle(UNEXPECTED_ERROR) + e.getClass().getName(); } return localizedMessage; } protected void createInfoMessage(String target, String message) { - createMessage(target, message, getInfoSeverity()); + createLocalizedMessage(target, message, getInfoSeverity()); } protected void createInfoMessage(String message) Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -56,6 +56,14 @@ private String wsdl; private transient RegistrationInfo expectedRegistrationInfo; + private static final String CANNOT_FIND_CONSUMER = "bean_consumer_cannot_find_consumer"; + private static final String CANNOT_UPDATE_CONSUMER = "bean_consumer_cannot_update_consumer"; + private static final String CANNOT_REFRESH_CONSUMER = "bean_consumer_cannot_refresh_consumer"; + private static final String MODIFY_REG_SUCCESS = "bean_consumer_modify_reg_success"; + private static final String INVALID_MODIFY = "bean_consumer_invalid_modify"; + private static final String CANNOT_MODIFY_REG = "bean_consumer_cannot_modify_reg"; + private static final String CANNOT_ERASE_REG = "bean_consumer_cannot_erase_reg"; + private static final String MALFORMED_URL = "bean_consumer_malformed_url"; public ConsumerBean() { @@ -125,7 +133,7 @@ } else { - beanContext.createErrorMessage("Couldn't find consumer '" + id + "'!"); + beanContext.createErrorMessage(CANNOT_FIND_CONSUMER, id); } } } @@ -319,7 +327,7 @@ return ConsumerManagerBean.CONFIGURE_CONSUMER; } - beanContext.createErrorMessage("Couldn't update Consumer!"); + beanContext.createErrorMessage(CANNOT_UPDATE_CONSUMER); return null; } @@ -347,7 +355,7 @@ return ConsumerManagerBean.CONFIGURE_CONSUMER; } - beanContext.createErrorMessage("Couldn't refresh Consumer!"); + beanContext.createErrorMessage(CANNOT_REFRESH_CONSUMER); return null; } @@ -394,7 +402,7 @@ registrationLocallyModified = false; - beanContext.createInfoMessage("Successfully modified Registration!"); + beanContext.createInfoMessage(MODIFY_REG_SUCCESS); } catch (Exception e) { @@ -410,11 +418,11 @@ } else { - beanContext.createErrorMessage("Invalid attempt to modify a Registration that hasn't been locally modified!"); + beanContext.createErrorMessage(INVALID_MODIFY); } } - beanContext.createErrorMessage("Couldn't modify Registration!"); + beanContext.createErrorMessage(CANNOT_MODIFY_REG); return null; } @@ -426,7 +434,7 @@ return ConsumerManagerBean.CONFIGURE_CONSUMER; } - beanContext.createErrorMessage("Couldn't erase local Registration!"); + beanContext.createErrorMessage(CANNOT_ERASE_REG); return null; } @@ -443,7 +451,7 @@ } catch (MalformedURLException e) { - beanContext.createErrorMessage(target, "'" + newValue + "' is not a valid URL: " + e.getLocalizedMessage()); + beanContext.createErrorMessage(target, MALFORMED_URL, newValue, e.getLocalizedMessage()); } } Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -49,6 +49,8 @@ static final String CONFIGURE_CONSUMER = "configureConsumer"; static final String CONSUMERS = "consumers"; static final String EXPECTED_REG_INFO_KEY = "expectedRegistrationInfo"; + private static final String NO_CONSUMER = "bean_consumermanager_no_consumer"; + private static final String INVALID_NEW_CONSUMER_NAME = "bean_consumermanager_invalid_new_consumer_name"; public ConsumerRegistry getRegistry() { @@ -167,7 +169,7 @@ } else { - beanContext.createErrorMessage("Need a non-null, non-empty name for the new Consumer"); + beanContext.createErrorMessage(INVALID_NEW_CONSUMER_NAME); return null; } } @@ -254,7 +256,7 @@ registry.deactivateConsumerWith(consumer.getProducerId()); } - beanContext.createInfoMessage(result.getStatus()); + beanContext.createMessage(BeanContext.STATUS, result.getStatus(), beanContext.getInfoSeverity()); // todo: localize status! } return result; } @@ -319,6 +321,6 @@ private void noSelectedConsumerError() { - beanContext.createErrorMessage("No Consumer was selected!"); + beanContext.createErrorMessage(NO_CONSUMER); } } \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/JSFBeanContext.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -25,6 +25,7 @@ import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; +import java.util.Locale; import java.util.Map; /** @@ -65,4 +66,9 @@ { return FacesMessage.SEVERITY_INFO; } + + protected Locale getLocale() + { + return FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + } } 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-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-06-06 17:41:24 UTC (rev 10938) @@ -104,7 +104,7 @@ } else { - return "RegistrationPolicy unset"; + return beanContext.getMessageFromBundle("bean_producer_regpolicy_unset"); } } @@ -181,7 +181,7 @@ catch (Exception e) { log.debug(e); - beanContext.createErrorMessage("status", "Couldn't save producer configuration. Cause: " + e.getLocalizedMessage()); + beanContext.createErrorMessage(BeanContext.STATUS, "bean_producer_cannot_save", e.getLocalizedMessage()); } return PRODUCER; } @@ -195,7 +195,7 @@ catch (Exception e) { log.debug(e); - beanContext.createErrorMessage("status", "Couldn't reload producer configuration. Cause: " + e.getLocalizedMessage()); + beanContext.createErrorMessage(BeanContext.STATUS, "bean_producer_cannot_reload", e.getLocalizedMessage()); } return PRODUCER; } 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-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-06 17:41:24 UTC (rev 10938) @@ -20,26 +20,33 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ + +## WSRP GUI localization + # JBoss Portal display information org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP Configuration org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration Portlet +# Tabs nav_tabs_consumers = Consumers Configuration nav_tabs_producer_config = Producer Configuration nav_tabs_producer_management = Producer Management +# Object path in consumer template path_consumers_root = Consumers path_consumers_consumer = Consumer ''{0}'' configuration path_consumers_active = active path_consumers_inactive = inactive path_consumers_refreshNeeded = (refresh needed) +# Confirm deletion of a consumer screen confirm_delete_consumer_title = Delete ''{0}'' consumer? confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer! confirm_detete_consumer_proceed = Are you sure you want to proceed? confirm_delete_consumer_submit = Delete consumer confirm_delete_consumer_cancel = Cancel +# Confirm deletion of local registration information screen confirm_delete_registration_title = Delete local registration for ''{0}'' consumer? confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\ This is only needed if this consumer had previously registered with the remote producer and this producer \n\ @@ -51,10 +58,12 @@ confirm_delete_registration_submit = Erase local registration confirm_delete_registration_cancel = Cancel +# Consumers screen consumers_title = Manage Consumers consumers_create_title = Create a consumer named: consumers_create_submit = Create Consumer +# Consumers list consumers_table_column_consumer = Consumer consumers_table_column_consumer_status = status: consumers_table_column_actions = Actions @@ -66,6 +75,7 @@ consumers_table_action_deregister = Deregister consumers_table_action_delete = Delete +# Consumer editing screen edit_consumer_producer = Producer id: edit_consumer_cache = Cache expiration: edit_consumer_cache_seconds = (seconds before expiration) @@ -90,6 +100,58 @@ edit_consumer_registration_context_handle = Handle: edit_consumer_registration_context_erase = Erase local registration edit_consumer_registration_context_erase_title = Erase local registration information (potentially dangerous!) -edit_consumer_refresh = Refresh &amp; Save +edit_consumer_refresh = Refresh & Save edit_consumer_refresh_title = Save changes and refresh information from producer edit_consumer_cancel = Cancel + +# Confirm registration property deletion screen +confirm_delete_reg_property_title = Delete ''{0}'' registration property description? +confirm_delete_reg_property_message = You are about to delete the ''{0}'' registration property description! \n\ +This will trigger invalidation of consumer registrations which will have to modify their registration \n\ +information. +confirm_detete_reg_property_proceed = Are you sure you want to proceed? +confirm_delete_reg_property_submit = Delete property +confirm_delete_reg_property_cancel = Cancel + +# Producer configuration screen +producer_config_title = Producer configuration +producer_config_sd_requires_reg = Access to full service description requires consumers to be registered. +producer_config_strict = Use strict WSRP compliance. +producer_config_requires_reg = Requires registration. Modifying this information will trigger invalidation of consumer registrations. +producer_config_reg_policy = Registration policy class name: +producer_config_reg_prop_validator = Registration property validator class name: +producer_config_reg_props = Registration properties +producer_config_reg_prop_name = Name +producer_config_reg_prop_type = Type +producer_config_reg_prop_label = Label +producer_config_reg_prop_hint = Hint +producer_config_reg_prop_action = Action +producer_config_reg_prop_remove = Remove +producer_config_no_reg_props = No specified required registration properties. +producer_config_add_reg_prop = Add property +producer_config_save = Save +producer_config_cancel = Cancel + +## Localized messages in JSF beans + +bean_support_unexpected_error = An unexpected error occured: +bean_support_cause = Cause: + +# ConsumerBean +bean_consumer_cannot_find_consumer = Couldn't find consumer ''{0}''! +bean_consumer_cannot_update_consumer = Couldn't update consumer! +bean_consumer_cannot_refresh_consumer = Couldn't refresh consumer! +bean_consumer_modify_reg_success = Successfully modified registration! +bean_consumer_invalid_modify = Invalid attempt to modify a registration that hasn't been locally modified! +bean_consumer_cannot_modify_reg = Couldn't modify registration! +bean_consumer_cannot_erase_reg = Couldn't erase local registration! +bean_consumer_malformed_url = ''{0}'' is not a valid URL: {1} + +# ConsumerManagerBean +bean_consumermanager_invalid_new_consumer_name = Need a non-null, non-empty name for the new consumer! +bean_consumermanager_no_consumer = No consumer was selected! + +# 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 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-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-06 17:41:24 UTC (rev 10938) @@ -75,7 +75,7 @@ edit_consumer_prop_desc=Description edit_consumer_prop_name=Nom edit_consumer_prop_value=Valeur -edit_consumer_refresh=Rafra\u00eechir &amp; Sauvegarder +edit_consumer_refresh=Rafra\u00eechir & Sauvegarder edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0 partir du producteur edit_consumer_registration=Information d'enregistrement: edit_consumer_registration_context=Contexte d'enregistrement: @@ -87,4 +87,43 @@ edit_consumer_registration_modify=Modifier l'enregistrement edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de propri\u00e9t\u00e9s d'enregistrement -edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour \ No newline at end of file +edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour +bean_consumer_cannot_erase_reg=L'effacement de l'enregistrement n'a pu \u00eatre effectu\u00e9! +bean_consumer_cannot_find_consumer=Le consommateur ''{0}'' n'a pu \u00eatre trouv\u00e9! +bean_consumer_cannot_modify_reg=La modification de l'enregistrement n'a pu \u00eatre effectu\u00e9e! +bean_consumer_cannot_refresh_consumer=Le rafra\u00eechissement du consommateur n'a pu \u00eatre effectu\u00e9! +bean_consumer_cannot_update_consumer=La mise \u00e0 jour du consommateur n'a pu \u00eatre effectu\u00e9e! +bean_consumer_invalid_modify=Tentative invalide de modification d'enregistrement sans modifications locales. +bean_consumer_malformed_url=''{0}'' n'est pas une URL valide: {1} +bean_consumer_modify_reg_success=Enregistrement modifi\u00e9! +bean_support_cause=Cause: +bean_support_unexpected_error=Une erreur inattendue s'est produite: +bean_consumermanager_invalid_new_consumer_name=Un consommateur requiert un nom non-nul et non-vide! +bean_consumermanager_no_consumer=Aucun consommateur n'a \u00e9t\u00e9 s\u00e9lectionn\u00e9! +bean_producer_cannot_reload=Le rechargement de la configuration du producteur a \u00e9chou\u00e9. Cause: {0} +bean_producer_cannot_save=La sauvegarde de la configuration du producteur a \u00e9chou\u00e9. Cause: {0} +bean_producer_regpolicy_unset=RegistrationPolicy non sp\u00e9cifi\u00e9e +confirm_delete_reg_property_cancel=Annuler +confirm_delete_reg_property_message=Vous \u00eates sur le point d'effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''! \n\ +Cel\u00e0 va entra\u00eener l'invalidation des enregistrements des consommateurs qui devront alors modifier \n\ +leur information d'enregistrement. +confirm_delete_reg_property_submit=Effacer la propri\u00e9t\u00e9 +confirm_delete_reg_property_title=Voulez-vous r\u00e9ellement effacer la description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''? +confirm_detete_reg_property_proceed=\u00cates-vous certains de vouloir proc\u00e9der? +producer_config_add_reg_prop=Ajouter une propri\u00e9t\u00e9 +producer_config_cancel=Annuler +producer_config_no_reg_props=Aucune propri\u00e9t\u00e9 d'enregistrement sp\u00e9cifi\u00e9e. +producer_config_reg_policy=Nom de la classe de la politique d'enregistrement: +producer_config_reg_prop_action=Action +producer_config_reg_prop_hint=Indice +producer_config_reg_prop_label=\u00c9tiquette +producer_config_reg_prop_name=Nom +producer_config_reg_prop_remove=Enlever +producer_config_reg_prop_type=Type +producer_config_reg_prop_validator=Nom de la classe de validation des propri\u00e9t\u00e9s d'enregistrement: +producer_config_reg_props=Propri\u00e9t\u00e9s d'enregistrement +producer_config_requires_reg=N\u00e9cessite l'enregistrement. Modifier cette information entra\u00eene l'invalidation des enregistrements consommateurs. +producer_config_save=Sauvegarder +producer_config_sd_requires_reg=L'acc\u00e8s \u00e0 la description compl\u00e8te des services requiert l'enregistrement. +producer_config_strict=Utiliser la validation WSRP stricte. +producer_config_title=Configuration producteur \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-06 17:41:24 UTC (rev 10938) @@ -20,7 +20,7 @@ <p class="portlet-msg-alert"> <h:outputFormat value="#{i18n.confirm_delete_consumer_message}"> <f:param value="#{consumersMgr.selectedConsumer.producerId}"/> - </h:outputFormat> + </h:outputFormat> </p> <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml 2008-06-06 17:41:24 UTC (rev 10938) @@ -7,9 +7,9 @@ <ui:define name="topnav"> <h:form> <ul class="topnav"> - <li><h:commandLink action="consumers" value="Consumers Configuration"/></li> - <li><h:commandLink action="producer" value="Producer Configuration"/></li> - <li id="currentTab">Producer Management</li> + <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li> + <li><h:commandLink action="producer" value="#{i18n.nav_tabs_producer_config}"/></li> + <li id="currentTab">#{i18n.nav_tabs_producer_management}</li> </ul> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml 2008-06-06 17:41:24 UTC (rev 10938) @@ -11,22 +11,26 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete '#{producer.selectedPropertyName}' registration property description?</h3> + <h3> + <h:outputFormat value="#{i18n.confirm_delete_reg_property_title}"> + <f:param value="#{producer.selectedPropertyName}"/> + </h:outputFormat> + </h3> <p class="portlet-msg-alert"> - You are about to delete the '#{producer.selectedPropertyName}' registration property description! - This will trigger invalidation of consumer registrations which will have to modify their registration - information. + <h:outputFormat value="#{i18n.confirm_delete_reg_property_message}"> + <f:param value="#{producer.selectedPropertyName}"/> + </h:outputFormat> </p> - <p class="portlet-class">Are you sure you want to proceed?</p> + <p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p> <h:form> - <h:commandButton value="Delete" action="#{producer.deleteRegistrationProperty}" + <h:commandButton value="#{i18n.confirm_delete_reg_property_submit}" action="#{producer.deleteRegistrationProperty}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton value="Cancel" action="producer" + <h:commandButton value="#{i18n.confirm_delete_reg_property_cancel}" action="producer" styleClass="portlet-form-button portlet-section-buttonrow"/> - </h:form> + </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-06-06 17:41:24 UTC (rev 10938) @@ -4,30 +4,29 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="title" value="Producer configuration"/> + <ui:param name="title" value="#{i18n.producer_config_title}"/> <ui:define name="content"> <h:form> <h:panelGrid columns="2" width="100%"> <h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/> - <h:outputText value="Access to full service description requires consumers to be registered."/> + <h:outputText value="#{i18n.producer_config_sd_requires_reg}"/> <h:selectBooleanCheckbox value="#{producer.strictMode}"/> - <h:outputText value="Use strict WSRP compliance."/> + <h:outputText value="#{i18n.producer_config_strict}"/> <h:selectBooleanCheckbox value="#{producer.registrationRequired}" immediate="true" onchange="this.form.submit()" valueChangeListener="#{producer.requireRegistrationListener}"/> - <h:outputText - value="Requires registration. Modifying this information will trigger invalidation of consumer registrations."/> + <h:outputText value="#{i18n.producer_config_requires_reg}"/> <h:outputText value=" " rendered="#{producer.registrationRequired}"/> <h:panelGroup rendered="#{producer.registrationRequired}"> <h:panelGrid columns="2" width="100%"> - <h:outputLabel value="Registration policy class name:" for="registrationPolicy"/> + <h:outputLabel value="#{i18n.producer_config_reg_policy}" for="registrationPolicy"/> <h:inputText id="registrationPolicy" value="#{producer.registrationPolicyClassName}" size="80"/> - <h:outputLabel value="Registration property validator class name:" for="validator" + <h:outputLabel value="#{i18n.producer_config_reg_prop_validator}" for="validator" rendered="#{producer.defaultRegistrationPolicy}"/> <h:inputText id="validator" value="#{producer.validatorClassName}" size="80" rendered="#{producer.defaultRegistrationPolicy}"/> @@ -37,7 +36,7 @@ <h:outputText value=" " rendered="#{producer.registrationRequired}"/> <h:panelGroup rendered="#{producer.registrationRequired}"> - <h:outputText styleClass="portlet-area-header" value="Registration properties"/> + <h:outputText styleClass="portlet-area-header" value="#{i18n.producer_config_reg_props}"/> <h:panelGroup styleClass="portlet-area-body"> <c:choose> <c:when test="#{!empty producer.registrationProperties}"> @@ -46,26 +45,26 @@ rendered="#{producer.registrationRequired}" headerClass="portlet-section-header"> <h:column> - <f:facet name="header">Name</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> <h:inputText value="#{property.nameAsString}" size="30"/> </h:column> <h:column> - <f:facet name="header">Type</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> <h:selectOneListbox disabled="true"> <f:selectItems value="#{producer.supportedPropertyTypes}"/> </h:selectOneListbox> </h:column> <h:column> - <f:facet name="header">Label</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> <h:inputText value="#{property.label}" size="50"/> </h:column> <h:column> - <f:facet name="header">Hint</f:facet> + <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> <h:inputText value="#{property.hint}" size="50"/> </h:column> <h:column> - <f:facet name="header">Action</f:facet> - <h:commandLink action="confirmPropDeletion" value="Remove" + <f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet> + <h:commandLink action="confirmPropDeletion" value="#{i18n.producer_config_reg_prop_remove}" styleClass="portlet-form-button" actionListener="#{producer.selectProperty}"> <f:param name="propName" value="#{property.nameAsString}"/> @@ -74,18 +73,18 @@ </h:dataTable> </c:when> <c:otherwise> - <h:outputText value="No specified required registration properties."/> + <h:outputText value="#{i18n.producer_config_no_reg_props}"/> </c:otherwise> </c:choose> - <h:commandLink action="#{producer.addRegistrationProperty}" value="Add property" + <h:commandLink action="#{producer.addRegistrationProperty}" value="#{i18n.producer_config_add_reg_prop}" styleClass="portlet-form-button"/> </h:panelGroup> </h:panelGroup> <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <h:commandButton action="#{producer.save}" value="Save" styleClass="portlet-form-button"/> - <h:commandButton action="#{producer.reloadConfiguration}" value="Cancel" + <h:commandButton action="#{producer.save}" value="#{i18n.producer_config_save}" styleClass="portlet-form-button"/> + <h:commandButton action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}" styleClass="portlet-form-button"/> </h:panelGroup> </h:panelGrid> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-06-06 17:05:14 UTC (rev 10937) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-06-06 17:41:24 UTC (rev 10938) @@ -7,10 +7,10 @@ <ui:define name="topnav"> <h:form> <ul class="topnav"> - <li><h:commandLink action="consumers" value="Consumers Configuration"/></li> - <li id="currentTab">Producer Configuration</li> + <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="Producer Management" action="management"/></li> + <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li> </ui:remove> </ul> </h:form>